Fix settings.

app/config/config.yml

@@ -94,7 +94,6 @@ twig:
           messages_count:
           message_link:
           is_profile_editable:
-          administrator_name:
           plugin_footer_left:
           plugin_footer_center:
           plugin_content_bottom:

main/admin/skill_badge_create.php

@@ -101,7 +101,7 @@ $toolbar = Display::toolbarButton(
 $tpl = new Template(get_lang('CreateBadge'));
 $tpl->assign(
     'platformAdminEmail',
-    api_get_setting('platform.administrator_email')
+    api_get_setting('admin.administrator_email')
 );
 $tpl->assign('skill', $skill);
 

main/auth/shibboleth/app/shibboleth.class.php

@@ -257,7 +257,7 @@ EOT;
             $header .= "Cc: $shibb_admin_email";
         }
 
-        $administrator_email = api_get_setting('platform.administrator_email');
+        $administrator_email = api_get_setting('admin.administrator_email');
         $result = mail($administrator_email, $subject, $message);
         return (bool) $result;
     }

main/cron/course_finished.php

@@ -38,12 +38,12 @@ if (empty($sessions)) {
 
 $administrator = [
     'complete_name' => api_get_person_name(
-        api_get_setting('platform.administrator_name'),
-        api_get_setting('platform.administrator_surname'),
+        api_get_setting('admin.administrator_name'),
+        api_get_setting('admin.administrator_surname'),
         null,
         PERSON_NAME_EMAIL_ADDRESS
     ),
-    'email' => api_get_setting('platform.administrator_email'),
+    'email' => api_get_setting('admin.administrator_email'),
 ];
 
 foreach ($sessions as $session) {

main/cron/import_csv.php

@@ -1602,7 +1602,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('platform.administrator_email');
+$from = api_get_setting('admin.administrator_email');
 /*
 if (!empty($emails)) {
     foreach ($emails as $email) {

main/cron/user_import/resend_email_with_new_password.php

@@ -106,17 +106,24 @@ foreach ($list as $mail) {
                 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')
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname')
             )."\n".get_lang('Manager', null, $l)." ".api_get_setting(
                 'platform.site_name'
-            )."\nT. ".api_get_setting('platform.administrator_phone')."\n".get_lang(
+            )."\nT. ".api_get_setting(
+                'admin.administrator_phone'
+            )."\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_get_setting('admin.administrator_email')."";
+        $sender_name = api_get_person_name(
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
+            null,
+            PERSON_NAME_EMAIL_ADDRESS
+        );
+        $email_admin = api_get_setting('admin.administrator_email');
         @api_mail_html(
             $recipient_name,
             $user['Email'],

main/gradebook/gradebook_display_summary.php

@@ -86,7 +86,7 @@ switch ($action) {
             // Print certificates (without the common header/footer/watermark
             //  stuff) and return as one multiple-pages PDF
             $address = api_get_setting('institution_address');
-            $phone = api_get_setting('platform.administrator_phone');
+            $phone = api_get_setting('admin.administrator_phone');
             $address = str_replace('\n', '<br />', $address);
             $pdf->custom_header = array('html' => "<h5 align='right'>$address <br />$phone</h5>");
             //  stuff) and return as one multiple-pages PDF

main/gradebook/index.php

@@ -973,7 +973,7 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
                     $pdf = new PDF('A4', $params['orientation'], $params);
 
                     $address = api_get_setting('institution_address');
-                    $phone = api_get_setting('platform.administrator_phone');
+                    $phone = api_get_setting('admin.administrator_phone');
                     $address = str_replace('\n', '<br />', $address);
                     $pdf->custom_header = array('html' => "<h5  align='right'>$address <br />$phone</h5>");
 

main/gradebook/lib/GradebookUtils.php

@@ -1462,7 +1462,7 @@ class GradebookUtils
             <textarea rows="5" cols="100" ></textarea>';
 
         $address = api_get_setting('institution_address');
-        $phone = api_get_setting('platform.administrator_phone');
+        $phone = api_get_setting('admin.administrator_phone');
         $address = str_replace('\n', '<br />', $address);
 
         $pdf->custom_header = array('html' => "<h5 align='right'>$address <br />$phone</h5>");

main/inc/ajax/admin.ajax.php

@@ -133,7 +133,8 @@ function check_system_version()
         $data = array(
             'url' => api_get_path(WEB_PATH),
             'campus' => api_get_setting('platform.site_name'),
-            'contact' => api_get_setting('platform.administrator_email'), // the admin's e-mail, with the only purpose of being able to contact admins to inform about critical security issues
+            'contact' => api_get_setting('admin.administrator_email'),
+            // the admin's e-mail, with the only purpose of being able to contact admins to inform about critical security issues
             'version' => $system_version,
             'numberofcourses' => $number_of_courses, // to sum up into non-personal statistics - see https://version.chamilo.org/stats/
             'numberofusers' => $number_of_users, // to sum up into non-personal statistics
@@ -144,7 +145,10 @@ function check_system_version()
             'donotlistcampus' => api_get_setting('platform.donotlistcampus'),
             'organisation' => api_get_setting('platform.institution'),
             'language' => api_get_setting('language.platform_language'), //helps us know the spread of language usage for campuses, by main language
-            'adminname' => api_get_setting('platform.administrator_name').' '.api_get_setting('platform.administrator_surname'), //not sure this is necessary...
+            'adminname' => api_get_setting(
+                    'admin.administrator_name'
+                ).' '.api_get_setting('admin.administrator_surname'),
+            //not sure this is necessary...
             'ip' => $_SERVER['REMOTE_ADDR'], //the admin's IP address, with the only purpose of trying to geolocate portals around the globe to draw a map
         );
         $version = null;

main/inc/ajax/user_manager.ajax.php

@@ -125,11 +125,11 @@ switch ($action) {
                             'platform.site_name'
                         );
                     $email_admin = api_get_setting(
-                        'platform.administrator_email'
+                        'admin.administrator_email'
                     );
                     $sender_name = api_get_person_name(
-                        api_get_setting('platform.administrator_name'),
-                        api_get_setting('platform.administrator_surname'),
+                        api_get_setting('admin.administrator_name'),
+                        api_get_setting('admin.administrator_surname'),
                         null,
                         PERSON_NAME_EMAIL_ADDRESS
                     );
@@ -145,8 +145,8 @@ switch ($action) {
                     $emailbody.=get_lang('HaveFun')."\n\n";
                     //$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula');
                     $emailbody .= api_get_person_name(
-                            api_get_setting('platform.administrator_name'),
-                            api_get_setting('platform.administrator_surname')
+                            api_get_setting('admin.administrator_name'),
+                            api_get_setting('admin.administrator_surname')
                         )."\n".get_lang('Manager')." ".api_get_setting(
                             'platform.site_name'
                         )."\nT. ".api_get_setting(

main/inc/email_editor.php

@@ -48,7 +48,7 @@ switch ($action) {
         $objTemplate->assign('user', api_get_user_info());
         $mailTemplate = $objTemplate->get_template('mail/subscribe_me_to_session.tpl');
 
-        $emailDest = api_get_setting('platform.administrator_email');
+        $emailDest = api_get_setting('admin.administrator_email');
         $emailTitle = get_lang('SubscribeToSessionRequest');
         $emailText = $objTemplate->fetch($mailTemplate);
         break;

main/inc/lib/add_course.lib.inc.php

@@ -1459,11 +1459,11 @@ class AddCourse
                 if ($send_mail_to_admin == 'true') {
                     $siteName = api_get_setting('platform.site_name');
                     $recipient_email = api_get_setting(
-                        'platform.administrator_email'
+                        'admin.administrator_email'
                     );
                     $recipient_name = api_get_person_name(
-                        api_get_setting('platform.administrator_name'),
-                        api_get_setting('platform.administrator_surname')
+                        api_get_setting('admin.administrator_name'),
+                        api_get_setting('admin.administrator_surname')
                     );
                     $iname = api_get_setting('platform.institution');
                     $subject = get_lang('NewCourseCreatedIn') . ' ' . $siteName . ' - ' . $iname;

main/inc/lib/course.lib.php

@@ -2535,12 +2535,12 @@ class CourseManager
             $recipient_name = api_get_person_name($tutor['firstname'], $tutor['lastname'], null,
                 PERSON_NAME_EMAIL_ADDRESS);
             $sender_name = api_get_person_name(
-                api_get_setting('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname'),
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname'),
                 null,
                 PERSON_NAME_EMAIL_ADDRESS
             );
-            $email_admin = api_get_setting('platform.administrator_email');
+            $email_admin = api_get_setting('admin.administrator_email');
 
             $additionalParameters = array(
                 'smsType' => SmsPlugin::NEW_USER_SUBSCRIBED_COURSE,

main/inc/lib/course_request.lib.php

@@ -169,13 +169,13 @@ 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('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
         $recipient_email_admin = api_get_setting(
-            'platform.administrator_email'
+            'admin.administrator_email'
         );
 
         $userInfo = api_get_user_info($user_id);
@@ -206,8 +206,8 @@ class CourseRequestManager
         $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('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname'),
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname'),
                 null,
                 null,
                 $email_language
@@ -221,7 +221,7 @@ class CourseRequestManager
                 'Phone',
                 null,
                 $email_language
-            ).': '.api_get_setting('platform.administrator_phone')."\n";
+            ).': '.api_get_setting('admin.administrator_phone')."\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";
 
@@ -522,8 +522,8 @@ class CourseRequestManager
             $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('platform.administrator_name'),
-                    api_get_setting('platform.administrator_surname'),
+                    api_get_setting('admin.administrator_name'),
+                    api_get_setting('admin.administrator_surname'),
                     null,
                     null,
                     $email_language
@@ -537,17 +537,17 @@ class CourseRequestManager
                     'Phone',
                     null,
                     $email_language
-                ).': '.api_get_setting('platform.administrator_phone')."\n";
+                ).': '.api_get_setting('admin.administrator_phone')."\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('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname'),
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname'),
                 null,
                 PERSON_NAME_EMAIL_ADDRESS
             );
-            $sender_email = api_get_setting('platform.administrator_email');
+            $sender_email = api_get_setting('admin.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;
@@ -629,8 +629,8 @@ class CourseRequestManager
         $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('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname'),
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname'),
                 null,
                 null,
                 $email_language
@@ -644,17 +644,17 @@ class CourseRequestManager
                 'Phone',
                 null,
                 $email_language
-            ).': '.api_get_setting('platform.administrator_phone')."\n";
+            ).': '.api_get_setting('admin.administrator_phone')."\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('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
-        $sender_email = api_get_setting('platform.administrator_email');
+        $sender_email = api_get_setting('admin.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;
@@ -729,8 +729,8 @@ class CourseRequestManager
         $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('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname')
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname')
             )."\n";
         $email_body .= get_lang(
                 'Manager',
@@ -741,21 +741,21 @@ class CourseRequestManager
                 'Phone',
                 null,
                 $email_language
-            ).': '.api_get_setting('platform.administrator_phone')."\n";
+            ).': '.api_get_setting('admin.administrator_phone')."\n";
         $email_body .= get_lang(
                 'Email',
                 null,
                 $email_language
-            ).': '.api_get_setting('platform.administrator_email')."\n";
+            ).': '.api_get_setting('admin.administrator_email')."\n";
         $email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
 
         $sender_name = api_get_person_name(
-            api_get_setting('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
-        $sender_email = api_get_setting('platform.administrator_email');
+        $sender_email = api_get_setting('admin.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;

main/inc/lib/events_email.class.php

@@ -35,25 +35,25 @@ class EventsMail
 
         // common variable for every mail sent
         $sender_name = api_get_person_name(
-            api_get_setting('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
-        $email_admin = api_get_setting('platform.administrator_email');
+        $email_admin = api_get_setting('admin.administrator_email');
         // basic  keys
         $event_data["sitename"] = api_get_setting('platform.site_name');
         $event_data["administrator_name"] = api_get_setting(
-            'platform.administrator_name'
+            'admin.administrator_name'
         );
         $event_data["administrator_surname"] = api_get_setting(
-            'platform.administrator_surname'
+            'admin.administrator_surname'
         );
         $event_data["administrator_phone"] = api_get_setting(
-            'platform.administrator_phone'
+            'admin.administrator_phone'
         );
         $event_data["administrator_email"] = api_get_setting(
-            'platform.administrator_email'
+            'admin.administrator_email'
         );
         $event_data["portal"] = api_get_path(WEB_PATH);
 

main/inc/lib/login.lib.php

@@ -103,22 +103,22 @@ 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('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
-        $email_admin = api_get_setting('platform.administrator_email');
+        $email_admin = api_get_setting('admin.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('platform.administrator_email'),
+                api_get_setting('admin.administrator_email'),
                 api_get_person_name(
-                    api_get_setting('platform.administrator_name'),
-                    api_get_setting('platform.administrator_surname')
+                    api_get_setting('admin.administrator_name'),
+                    api_get_setting('admin.administrator_surname')
                 )
             );
 
@@ -158,7 +158,7 @@ class Login
         $email_body .= "\n\n".get_lang(
                 'SignatureFormula'
             ).",\n".api_get_setting(
-                'platform.administrator_name'
+                'admin.administrator_name'
             )." ".api_get_setting(
                 'administratorSurname'
             )."\n".get_lang('PlataformAdmin')." - ".api_get_setting(
@@ -166,12 +166,12 @@ class Login
             );
 
         $sender_name = api_get_person_name(
-            api_get_setting('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );
-        $email_admin = api_get_setting('platform.administrator_email');
+        $email_admin = api_get_setting('admin.administrator_email');
 
         $result = @api_mail_html(
             '',
@@ -186,10 +186,10 @@ class Login
             return get_lang('YourPasswordHasBeenEmailed');
         } else {
             $admin_email = Display:: encrypted_mailto_link(
-                api_get_setting('platform.administrator_email'),
+                api_get_setting('admin.administrator_email'),
                 api_get_person_name(
-                    api_get_setting('platform.administrator_name'),
-                    api_get_setting('platform.administrator_surname')
+                    api_get_setting('admin.administrator_name'),
+                    api_get_setting('admin.administrator_surname')
                 )
             );
             $message = sprintf(get_lang('ThisPlatformWasUnableToSendTheEmailPleaseContactXForMoreInformation'), $admin_email);

main/inc/lib/myspace.lib.php

@@ -2601,16 +2601,16 @@ class MySpace
                     get_lang('Problem')."\n\n".
                     get_lang('SignatureFormula').",\n\n".
                     api_get_person_name(
-                        api_get_setting('platform.administrator_name'),
-                        api_get_setting('platform.administrator_surname')
+                        api_get_setting('admin.administrator_name'),
+                        api_get_setting('admin.administrator_surname')
                     )."\n".
                     get_lang('Manager')." ".api_get_setting(
                         'platform.site_name'
                     )."\nT. ".
                     api_get_setting(
-                        'platform.administrator_phone'
+                        'admin.administrator_phone'
                     )."\n".get_lang('Email')." : ".api_get_setting(
-                        'platform.administrator_email'
+                        'admin.administrator_email'
                     );
 
                 api_mail_html(

main/inc/lib/notification.lib.php

@@ -69,10 +69,10 @@ class Notification extends Model
 
         // If no-reply email doesn't exist use the admin name/email
         if (empty($this->adminEmail)) {
-            $this->adminEmail = api_get_setting('platform.administrator_email');
+            $this->adminEmail = api_get_setting('admin.administrator_email');
             $this->adminName = api_get_person_name(
-                api_get_setting('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname'),
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname'),
                 null,
                 PERSON_NAME_EMAIL_ADDRESS
             );

main/inc/lib/sessionmanager.lib.php

@@ -1643,10 +1643,10 @@ class SessionManager
                     $subject,
                     $content,
                     api_get_person_name(
-                        api_get_setting('platform.administrator_name'),
-                        api_get_setting('platform.administrator_surname')
+                        api_get_setting('admin.administrator_name'),
+                        api_get_setting('admin.administrator_surname')
                     ),
-                    api_get_setting('platform.administrator_email')
+                    api_get_setting('admin.administrator_email')
                 );
             }
         }

main/inc/lib/template.lib.php

@@ -993,10 +993,10 @@ class Template
         if (api_get_setting('show_administrator_data') == 'true') {
             // Administrator name
             $administrator_data = get_lang('Manager').' : '.Display::encrypted_mailto_link(
-                    api_get_setting('platform.administrator_email'),
+                    api_get_setting('admin.administrator_email'),
                     api_get_person_name(
-                        api_get_setting('platform.administrator_name'),
-                        api_get_setting('platform.administrator_surname')
+                        api_get_setting('admin.administrator_name'),
+                        api_get_setting('admin.administrator_surname')
                     )
                 );
             $this->assign('administrator_name', $administrator_data);
@@ -1305,10 +1305,10 @@ class Template
     private function setAdministratorParams()
     {
         $_admin = [
-            'email' => api_get_setting('platform.administrator_email'),
-            'surname' => api_get_setting('platform.administrator_surname'),
-            'name' => api_get_setting('platform.administrator_name'),
-            'telephone' => api_get_setting('platform.administrator_phone'),
+            'email' => api_get_setting('admin.administrator_email'),
+            'surname' => api_get_setting('admin.administrator_surname'),
+            'name' => api_get_setting('admin.administrator_name'),
+            'telephone' => api_get_setting('admin.administrator_phone'),
         ];
 
         $this->assign('_admin', $_admin);

main/inc/lib/usermanager.lib.php

@@ -292,12 +292,12 @@ class UserManager
                 );
                 $emailSubject = $tplSubject->fetch($layoutSubject);
                 $sender_name = api_get_person_name(
-                    api_get_setting('platform.administrator_name'),
-                    api_get_setting('platform.administrator_surname'),
+                    api_get_setting('admin.administrator_name'),
+                    api_get_setting('admin.administrator_surname'),
                     null,
                     PERSON_NAME_EMAIL_ADDRESS
                 );
-                $email_admin = api_get_setting('platform.administrator_email');
+                $email_admin = api_get_setting('admin.administrator_email');
 
                 if (api_is_multiple_url_enabled()) {
                     $access_url_id = api_get_current_access_url_id();
@@ -834,12 +834,12 @@ class UserManager
                     'platform.site_name'
                 );
             $sender_name = api_get_person_name(
-                api_get_setting('platform.administrator_name'),
-                api_get_setting('platform.administrator_surname'),
+                api_get_setting('admin.administrator_name'),
+                api_get_setting('admin.administrator_surname'),
                 null,
                 PERSON_NAME_EMAIL_ADDRESS
             );
-            $email_admin = api_get_setting('platform.administrator_email');
+            $email_admin = api_get_setting('admin.administrator_email');
 
             if (api_is_multiple_url_enabled()) {
                 $access_url_id = api_get_current_access_url_id();
@@ -866,8 +866,8 @@ class UserManager
                         )."\n\n".get_lang(
                             'SignatureFormula'
                         ).",\n\n".api_get_person_name(
-                            api_get_setting('platform.administrator_name'),
-                            api_get_setting('platform.administrator_surname')
+                            api_get_setting('admin.administrator_name'),
+                            api_get_setting('admin.administrator_surname')
                         )."\n".get_lang('Manager')." ".api_get_setting(
                             'platform.site_name'
                         )."\nT. ".api_get_setting(
@@ -896,8 +896,8 @@ class UserManager
                     )."\n\n".get_lang(
                         'SignatureFormula'
                     ).",\n\n".api_get_person_name(
-                        api_get_setting('platform.administrator_name'),
-                        api_get_setting('platform.administrator_surname')
+                        api_get_setting('admin.administrator_name'),
+                        api_get_setting('admin.administrator_surname')
                     )."\n".get_lang('Manager')." ".api_get_setting(
                         'platform.site_name'
                     )."\nT. ".api_get_setting(

main/mySpace/user_edit.php

@@ -175,14 +175,14 @@ if ($form->validate()) {
                 get_lang('Problem'). "\n\n".
                 get_lang('SignatureFormula').",\n\n".
                 api_get_person_name(
-                    api_get_setting('platform.administrator_name'),
-                    api_get_setting('platform.administrator_surname')
+                    api_get_setting('admin.administrator_name'),
+                    api_get_setting('admin.administrator_surname')
                 )."\n".
                 get_lang('Manager'). " ".
                 api_get_setting('platform.site_name')."\nT. ".
-                api_get_setting('platform.administrator_phone')."\n".
+                api_get_setting('admin.administrator_phone')."\n".
                 get_lang('Email')." : ".api_get_setting(
-                    'platform.administrator_email'
+                    'admin.administrator_email'
                 );
 
 			api_mail_html(

main/template/default/layout/footer.tpl

@@ -1,77 +0,0 @@
-<footer> <!-- start of #footer section -->
-    <div class="container">
-        <div class="row">
-            <div id="footer_left" class="col-md-4">
-                {% if session_teachers is not null %}
-                    <div id="session_teachers">
-                        {{ session_teachers }}
-                    </div>
-                {% endif %}
-
-                {% if teachers is not null %}
-                    <div id="teachers">
-                        {{ teachers }}
-                    </div>
-                {% endif %}
-
-                {#  Plugins for footer section #}
-                {% if plugin_footer_left is not null %}
-                    <div id="plugin_footer_left">
-                        {{ plugin_footer_left }}
-                    </div>
-                {% endif %}
-                &nbsp;
-            </div>
-
-            <div id="footer_center" class="col-md-4">
-                {#   Plugins for footer section  #}
-                {% if plugin_footer_center is not null %}
-                    <div id="plugin_footer_center">
-                        {{ plugin_footer_center }}
-                    </div>
-                {% endif %}
-                &nbsp;
-            </div>
-
-            <div id="footer_right" class="col-md-4">
-                {% if administrator_name is not null %}
-                    <div id="admin_name">
-                        {{ administrator_name }}
-                    </div>
-                {% endif %}
-
-                <div id="software_name">
-	                <a href="{{_p.web}}" target="_blank">{{ "PoweredByX" |get_lang | format(_s.software_name) }}</a>
-                    &copy; {{ "now"|date("Y") }}
-                </div>
-                {#   Plugins for footer section  #}
-                {% if plugin_footer_right is not null %}
-                    <div id="plugin_footer_right">
-                        {{ plugin_footer_right }}
-                    </div>
-                {% endif %}
-                &nbsp;
-            </div><!-- end of #footer_right -->
-        </div><!-- end of #row -->
-        <div class="extra-footer">
-            {{ footer_extra_content }}
-        </div>
-    </div><!-- end of #container -->
-</footer>
-
-<div class="modal fade" id="expand-image-modal" tabindex="-1" role="dialog" aria-labelledby="expand-image-modal-title" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="{{ "Close" | get_lang }}"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="expand-image-modal-title">&nbsp;</h4>
-            </div>
-            <div class="modal-body">
-            </div>
-        </div>
-    </div>
-</div>
-
-{% include template ~ '/layout/footer.js.tpl' %}
-
-{{ execution_stats }}

main/webservices/registration.soap.php

@@ -970,7 +970,7 @@ function WSCreateUsersPasswordCrypted($params)
     return $output;
 }
 // Subscribe / Unsubscribe Teacher to Session Course
-// 
+//
 // Prepare Input params for Subscribe Teacher to SC
 $server->wsdl->addComplexType(
     'SubscribeTeacherToSessionCourse',
@@ -1032,18 +1032,18 @@ $server->register(
     function WSSubscribeTeacherToSessionCourse($params)
     {
         global $debug;
-        
+
         if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
         if ($debug) error_log('Params '. print_r($params, 1));
-        
+
         if (!WSHelperVerifyKey($params)) {
             return return_error(WS_ERROR_SECRET_KEY);
         }
-        
+
         $userId = $params['userId']; // Chamilo user Id
         $sessionId = $params['sessionId']; // Current Session course ID
         $courseId = $params['courseId']; // Course Real Id
-        
+
         return (SessionManager::set_coach_to_course_session($userId, $sessionId, $courseId));
     }
 
@@ -1056,20 +1056,20 @@ $server->register(
     function WSUnsubscribeTeacherFromSessionCourse($params)
     {
         global $debug;
-        
+
         if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
         if ($debug) error_log('Params '. print_r($params, 1));
-        
+
         if (!WSHelperVerifyKey($params)) {
             return return_error(WS_ERROR_SECRET_KEY);
         }
-        
+
         $userId = $params['userId']; // Chamilo user Id
         $sessionId = $params['sessionId']; // Current Session course ID
         $courseId = $params['courseId']; // Course Real Id
-        
+
         return (SessionManager::removeUsersFromCourseSession($userId, $sessionId, $courseId));
-        
+
     }
 
 
@@ -2916,8 +2916,8 @@ function WSCreateCourseByTitle($params)
         $title = $course_param['title'];
         $category_code = 'LANG'; // TODO: A hard-coded value.
         $wanted_code = '';
-        $tutor_firstname = api_get_setting('platform.administrator_name');
-        $tutor_lastname = api_get_setting('platform.administrator_surname');
+        $tutor_firstname = api_get_setting('admin.administrator_name');
+        $tutor_lastname = api_get_setting('admin.administrator_surname');
         $course_language = 'spanish'; // TODO: Incorrect default value, it should 'english'.
         if (!empty($course_param['course_language'])) {
             $course_language = $course_param['course_language'];

main/wiki/wiki.inc.php

@@ -1870,8 +1870,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('platform.administrator_email');
-                $sender_email = api_get_setting('platform.administrator_email');
+                $sender_name = api_get_setting('admin.administrator_email');
+                $sender_email = api_get_setting('admin.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){

main/work/work.lib.php

@@ -3605,10 +3605,10 @@ function sendAlertToUsers($workId, $courseInfo, $session_id)
     }
 
     if ($send) {
-        $senderEmail = api_get_setting('platform.administrator_email');
+        $senderEmail = api_get_setting('admin.administrator_email');
         $senderName = api_get_person_name(
-            api_get_setting('platform.administrator_name'),
-            api_get_setting('platform.administrator_surname'),
+            api_get_setting('admin.administrator_name'),
+            api_get_setting('admin.administrator_surname'),
             null,
             PERSON_NAME_EMAIL_ADDRESS
         );

plugin/clockworksms/lib/clockworksms.lib.php

@@ -44,12 +44,12 @@ class Clockworksms implements SmsPluginLibraryInterface
             } else {
                 $this->api = new Clockwork(' ');
                 $recipient_name = api_get_person_name(
-                    api_get_setting('platform.administrator_name'),
-                    api_get_setting('platform.administrator_surname'),
+                    api_get_setting('admin.administrator_name'),
+                    api_get_setting('admin.administrator_surname'),
                     null,
                     PERSON_NAME_EMAIL_ADDRESS
                 );
-                $email_form = api_get_setting('platform.administrator_email');
+                $email_form = api_get_setting('admin.administrator_email');
                 $emailsubject = 'Clockworksms error';
                 $emailbody = 'Key cannot be blank';
                 $sender_name = $recipient_name;

src/Chamilo/CoreBundle/Framework/Template.php

@@ -756,8 +756,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('platform.administrator_email'),
-                api_get_person_name(api_get_setting('platform.administrator_name'), api_get_setting('platform.administrator_surname'))
+                api_get_setting('admin.administrator_email'),
+                api_get_person_name(api_get_setting('admin.administrator_name'), api_get_setting('admin.administrator_surname'))
             );
             $this->assign('administrator_name', $administrator_data);
         }

src/Chamilo/CoreBundle/Resources/views/default/layout/footer.html.twig

@@ -36,19 +36,21 @@
             </div>
 
             <div id="footer_right" class="col-md-4">
-                {% if administrator_name is not null %}
+                {% if chamilo_settings_get('display.show_administrator_data') == 'true' %}
                     <div id="admin_name">
-                        {{ administrator_name }}
+                        {{ 'Manager' | trans }}
+                        : {{ chamilo_settings_get('admin.administrator_name') }} {{ chamilo_settings_get('admin.administrator_surname') }}
                     </div>
                 {% endif %}
 
                 <div id="software_name">
-                    {{ "Platform"|trans }} <a href="{{ url('home') }}"
-                                              target="_blank">
+                    {{ "Platform"|trans }}
+                    <a href="{{ url('home') }}" target="_blank">
                         {{ software_name }}
                     </a>
                     &copy; {{ "now"|date("Y") }}
                 </div>
+
                 {#   Plugins for footer section  #}
                 {% if plugin_footer_right is not null %}
                     <div id="plugin_footer_right">
@@ -61,4 +63,21 @@
     </div><!-- end of #container -->
 </footer>
 
+<div class="modal fade" id="expand-image-modal" tabindex="-1" role="dialog"
+     aria-labelledby="expand-image-modal-title" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"
+                        aria-label="{{ "Close" | trans }}"><span
+                            aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="expand-image-modal-title">
+                    &nbsp;</h4>
+            </div>
+            <div class="modal-body">
+            </div>
+        </div>
+    </div>
+</div>
+
 {{ footer_extra_content }}

src/Chamilo/CoreBundle/Settings/CourseSettingsSchema.php

@@ -72,7 +72,8 @@ class CourseSettingsSchema implements SchemaInterface
                     'course_validation_terms_and_conditions_url' => '',
                     'course_hide_tools' => [],
                     'scorm_cumulative_session_time' => '',
-                    'courses_default_creation_visibility' => '',
+                    'courses_default_creation_visibility' => '2',
+                    //COURSE_VISIBILITY_OPEN_PLATFORM
                     'allow_public_certificates' => '',
                     'allow_lp_return_link' => '',
                     'course_creation_use_template' => '',

src/Chamilo/CoreBundle/Settings/DisplaySettingsSchema.php

@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Settings;
 
@@ -21,7 +22,7 @@ class DisplaySettingsSchema implements SchemaInterface
             ->setDefaults(
                 array(
                     'enable_help_link' => '',
-                    'show_administrator_data' => '',
+                    'show_administrator_data' => 'true',
                     'show_tutor_data' => '',
                     'show_teacher_data' => '',
                     'showonline' => '',
@@ -68,8 +69,11 @@ class DisplaySettingsSchema implements SchemaInterface
                 'showonline',
                 'choice',
                 array(
-                    'choices' =>
-                        array('course', 'users', 'world'),
+                    'choices' => array(
+                        'course' => 'course',
+                        'users' => 'users',
+                        'world' => 'world',
+                    ),
                 )
             )
             ->add('allow_user_headings', 'yes_no')

src/Chamilo/CoreBundle/Settings/PlatformSettingsSchema.php

@@ -24,10 +24,10 @@ class PlatformSettingsSchema implements SchemaInterface
                     'institution' => 'Chamilo.org',
                     'institution_url' => 'http://www.chamilo.org',
                     'site_name' => 'Chamilo site',
-                    'administrator_email' => 'admin@example.org',
-                    'administrator_name' => 'Jane',
-                    'administrator_surname' => 'Doe',
-                    'administrator_phone' => '123456',
+//                    'administrator_email' => 'admin@example.org',
+//                    'administrator_name' => 'Jane',
+//                    'administrator_surname' => 'Doe',
+//                    'administrator_phone' => '123456',
                     'timezone' => 'Europe/Paris',
                     'theme' => 'chamilo',
                     'gravatar_enabled' => 'false',
@@ -49,10 +49,10 @@ class PlatformSettingsSchema implements SchemaInterface
                     'institution' => array('string'),
                     'institution_url' => array('string'),
                     'site_name' => array('string'),
-                    'administrator_email' => array('string'),
-                    'administrator_name' => array('string'),
-                    'administrator_surname' => array('string'),
-                    'administrator_phone' => array('string'),
+//                    'administrator_email' => array('string'),
+//                    'administrator_name' => array('string'),
+//                    'administrator_surname' => array('string'),
+//                    'administrator_phone' => array('string'),
                     'timezone' => array('string'),
                     'gravatar_enabled' => array('string'),
                     'gravatar_type' => array('string'),
@@ -70,10 +70,10 @@ class PlatformSettingsSchema implements SchemaInterface
             ->add('institution')
             ->add('institution_url', 'url')
             ->add('site_name')
-            ->add('administrator_email', 'email')
-            ->add('administrator_name')
-            ->add('administrator_surname')
-            ->add('administrator_phone')
+//            ->add('administrator_email', 'email')
+//            ->add('administrator_name')
+//            ->add('administrator_surname')
+//            ->add('administrator_phone')
             ->add('timezone', 'timezone')
             ->add('theme')
             ->add('gravatar_enabled', 'yes_no')
@@ -84,8 +84,6 @@ class PlatformSettingsSchema implements SchemaInterface
             ->add('donotlistcampus', 'yes_no')
             ->add('course_catalog_hide_private', 'yes_no')
             ->add('catalog_show_courses_sessions')
-
-
         ;
     }
 }

src/Chamilo/CoreBundle/Settings/RegistrationSettingsSchema.php

@@ -66,10 +66,10 @@ class RegistrationSettingsSchema implements SchemaInterface
                 array(
                     'multiple' => true,
                     'choices' => array(
-                        'officialcode',
-                        'email',
-                        'language',
-                        'phone',
+                        'officialcode' => 'officialcode',
+                        'email' => 'email',
+                        'language' => 'language',
+                        'phone' => 'phone',
                     ),
                 )
             )

src/Chamilo/InstallerBundle/Process/Step/SetupStep.php

@@ -70,10 +70,11 @@ class SetupStep extends AbstractStep
             );
         }
 
+
         $form = $this->createSetupForm();
         $form->get('admin')->setData($adminUser);
 
-        $form->handleRequest($this->getRequest());
+        $form->handleRequest($context->getRequest());
 
         if ($form->isValid()) {
             // pass "load demo fixtures" flag to the next step
@@ -98,14 +99,19 @@ class SetupStep extends AbstractStep
                 )->getData(),
                 'site_name' => $form->get('portal')->get('site_name')->getData(
                 ),
+                'timezone' => $form->get('portal')->get('timezone')->getData(),
+            );
+            $settings->setParameters($parameters);
+            $settingsManager->saveSettings('platform', $settings);
+
+            $parameters = array(
                 'administrator_email' => $adminUser->getEmail(),
                 'administrator_name' => $adminUser->getFirstName(),
                 'administrator_surname' => $adminUser->getLastName(),
                 'administrator_phone' => $adminUser->getPhone(),
-                'timezone' => $form->get('portal')->get('timezone')->getData(),
             );
             $settings->setParameters($parameters);
-            $settingsManager->saveSettings('platform', $settings);
+            $settingsManager->saveSettings('admin', $settings);
 
             /*$defaultCompanyName  = $configManager->get('oro_ui.application_name');
             $defaultCompanyTitle = $configManager->get('oro_ui.application_title');