From b5a4ee2dcd1139f76b69a5fb30b5efe08932bb7d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 10 Dec 2020 10:13:10 +0100
Subject: [PATCH] Minor - format code

---
 custompages/first_login-dist.php              |  2 +-
 custompages/registration-feedback-dist.php    |  2 +-
 main/admin/dashboard_add_courses_to_user.php  |  2 +-
 main/admin/dashboard_add_sessions_to_user.php |  2 +-
 main/admin/index.php                          |  2 +-
 .../init_cas_user_extra_field_from_ldap.php   | 28 +++++++++----------
 main/admin/ldap_import_students.php           |  2 +-
 .../admin/ldap_import_students_to_session.php |  2 +-
 main/admin/teacher_time_report.php            |  2 +-
 main/admin/user_move_stats.php                |  2 +-
 .../complete_phone_number.php                 |  2 +-
 main/auth/external_login/ldap.inc.php         |  1 -
 .../external_login/ldap_import_all_users.php  |  2 +-
 main/calendar/ical_export.php                 |  2 +-
 main/cron/archive_table_records.php           |  4 +--
 main/cron/document/finddoc.php                |  2 +-
 main/cron/document/index_all_docs.php         |  2 +-
 main/cron/import_csv.php                      |  2 +-
 main/cron/lang/check_parse_lang.php           |  3 +-
 main/cron/lang/langstats.php                  |  2 +-
 main/cron/lang/list_undefined_langvars.php    |  7 +++--
 main/cron/lang/list_unused_langvars.php       |  7 +++--
 main/cron/lang/switch_files_to_gettext.php    |  2 +-
 main/cron/notification.php                    |  2 +-
 main/cron/user_import/client.php              |  2 +-
 main/cron/user_import/get_data_from_mail.php  |  2 +-
 .../resend_email_with_new_password.php        |  2 +-
 main/document/edit_draw.php                   |  2 +-
 main/document/edit_paint.php                  |  2 +-
 main/document/remote.php                      |  4 +--
 main/document/save_pixlr.php                  |  2 +-
 main/document/webcam_receiver.php             |  4 +--
 main/dropbox/dropbox_class.inc.php            |  6 ++--
 main/dropbox/dropbox_functions.inc.php        |  4 +--
 main/exercise/exercise_show.php               |  2 +-
 main/extra/save_school_calendar.php           |  2 +-
 main/extra/userInfo.php                       |  2 +-
 main/gradebook/index.php                      |  2 +-
 main/gradebook/lib/be/result.class.php        |  4 +--
 main/gradebook/lib/be/surveylink.class.php    |  2 +-
 .../lib/fe/linkaddeditform.class.php          |  2 +-
 .../lib/user_data_generator.class.php         |  4 +--
 main/inc/ajax/admin.ajax.php                  | 10 +++----
 main/inc/ajax/career.ajax.php                 |  1 -
 main/inc/ajax/record_audio_wami.ajax.php      |  8 +++---
 main/inc/ajax/session.ajax.php                |  2 +-
 main/inc/global-min.inc.php                   |  4 +--
 main/inc/global.inc.php                       |  4 +--
 main/inc/global_error_message.inc.php         |  2 +-
 main/inc/lib/course_home.lib.php              |  2 +-
 main/inc/lib/display.lib.php                  |  2 +-
 main/inc/lib/extra_field_option.lib.php       |  2 +-
 main/inc/lib/fileUpload.lib.php               |  4 +--
 main/inc/lib/groupmanager.lib.php             |  2 +-
 main/inc/lib/legal.lib.php                    |  2 +-
 main/inc/lib/message.lib.php                  |  1 -
 main/inc/local.inc.php                        |  3 +-
 57 files changed, 91 insertions(+), 94 deletions(-)

diff --git a/custompages/first_login-dist.php b/custompages/first_login-dist.php
index d0bf020bd3..3e8909aaa5 100644
--- a/custompages/first_login-dist.php
+++ b/custompages/first_login-dist.php
@@ -12,7 +12,7 @@ require_once __DIR__.'/language.php';
  * Security checks.
  */
 if (!isset($_SESSION['conditional_login']['uid'])) {
-    die("Not Authorised");
+    exit("Not Authorised");
 }
 
 if (isset($_POST['password'])) {
diff --git a/custompages/registration-feedback-dist.php b/custompages/registration-feedback-dist.php
index 654eebf6c6..b0b8671a04 100644
--- a/custompages/registration-feedback-dist.php
+++ b/custompages/registration-feedback-dist.php
@@ -33,7 +33,7 @@ $rootWeb = api_get_path('WEB_PATH');
                     </div>
                     <div id="registration-form-box" class="form-box">
                         <div class="block-form-login">
-                            <?php   echo $content['info']; ?>
+                            <?php echo $content['info']; ?>
                         </div>
                     </div>
                     <div id="footer">
diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php
index 91cdbddafd..5ac4a0bdc9 100755
--- a/main/admin/dashboard_add_courses_to_user.php
+++ b/main/admin/dashboard_add_courses_to_user.php
@@ -248,7 +248,7 @@ if (!empty($msg)) {
         <p><?php echo get_lang('FirstLetterCourse'); ?> :</p>
         <select name="firstLetterCourse" class="selectpicker form-control" onchange = "xajax_search_courses(this.value,'multiple')">
             <option value="%">--</option>
-            <?php  echo Display :: get_alphabet_options($firstLetter); ?>
+            <?php echo Display :: get_alphabet_options($firstLetter); ?>
         </select>
         <?php
     } ?>
diff --git a/main/admin/dashboard_add_sessions_to_user.php b/main/admin/dashboard_add_sessions_to_user.php
index 7eb0ceaa5a..e06baa1f6c 100755
--- a/main/admin/dashboard_add_sessions_to_user.php
+++ b/main/admin/dashboard_add_sessions_to_user.php
@@ -243,7 +243,7 @@ $result = Database::query($sql);
                 <p><?php echo get_lang('FirstLetterSession'); ?> :</p>
                 <select class="selectpicker form-control" name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
                     <option value="%">--</option>
-                        <?php  echo Display :: get_alphabet_options($firstLetterSession); ?>
+                        <?php echo Display :: get_alphabet_options($firstLetterSession); ?>
                 </select>
                 <?php
                     } ?>
diff --git a/main/admin/index.php b/main/admin/index.php
index 415bfca722..fc125c4741 100644
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -927,7 +927,7 @@ if (api_is_platform_admin()) {
             }
 
             if (!is_writable($adminExtraContentDir)) {
-                die;
+                exit;
             }
 
             $fullFilePath = $adminExtraContentDir.$extraData['block'];
diff --git a/main/admin/init_cas_user_extra_field_from_ldap.php b/main/admin/init_cas_user_extra_field_from_ldap.php
index 8e0aef8cd5..666ec7ecef 100644
--- a/main/admin/init_cas_user_extra_field_from_ldap.php
+++ b/main/admin/init_cas_user_extra_field_from_ldap.php
@@ -45,7 +45,7 @@ If this script is run after all user accounts were CASified, it just stops after
 This can be used to check whether no work is left to do.
 */
 if (php_sapi_name() !== 'cli') {
-    die("this script is supposed to be run from the command-line\n");
+    exit("this script is supposed to be run from the command-line\n");
 }
 require __DIR__.'/../../cli-config.php';
 require_once __DIR__.'/../../app/config/auth.conf.php';
@@ -66,7 +66,7 @@ foreach ($extldap_config['host'] as $ldapHost) {
     }
 }
 if (false === $ldap) {
-    die("ldap_connect() failed\n");
+    exit("ldap_connect() failed\n");
 }
 echo "Connected to LDAP server $ldapHost.\n";
 
@@ -83,21 +83,21 @@ ldap_set_option(
 );
 
 ldap_bind($ldap, $extldap_config['admin_dn'], $extldap_config['admin_password'])
-or die('ldap_bind() failed: '.ldap_error($ldap)."\n");
+or exit('ldap_bind() failed: '.ldap_error($ldap)."\n");
 echo "Bound to LDAP server as ${extldap_config['admin_dn']}.\n";
 
 // set a few variables for LDAP search
 
 $baseDn = $extldap_config['base_dn']
-or die("cannot read the LDAP directory base DN where to search for user entries\n");
+or exit("cannot read the LDAP directory base DN where to search for user entries\n");
 echo "Base DN is '$baseDn'.\n";
 
 $ldapCASUserAttribute = $extldap_user_correspondance['extra']['cas_user']
-or die("cannot read the name of the LDAP attribute where to find the CAS user code\n");
+or exit("cannot read the name of the LDAP attribute where to find the CAS user code\n");
 echo "LDAP CAS user code attribute is '$ldapCASUserAttribute'.\n";
 
 $ldapUsernameAttribute = $extldap_user_correspondance['username']
-or die("cannot read the name of the LDAP attribute where to find the username\n");
+or exit("cannot read the name of the LDAP attribute where to find the username\n");
 echo "LDAP username attribute is '$ldapUsernameAttribute'.\n";
 
 $filters = [
@@ -124,10 +124,10 @@ if (empty($extraFieldData)) {
             ]
         );
         if (false === $fieldId) {
-            die("failed to create extra field\n");
+            exit("failed to create extra field\n");
         }
     } else {
-        die("Required extra field is missing\n");
+        exit("Required extra field is missing\n");
     }
 } else {
     $fieldId = $extraFieldData['id'];
@@ -175,7 +175,7 @@ foreach ($databaseUsers as $user) {
         .'))';
     $searchResult = ldap_search($ldap, $baseDn, $filter, [$ldapCASUserAttribute, $ldapUsernameAttribute]);
     if (false === $searchResult) {
-        die('ldap_search() failed: '.ldap_error($ldap)."\n");
+        exit('ldap_search() failed: '.ldap_error($ldap)."\n");
     }
     $userId = $user->getId();
     echo "$username ($userId): ";
@@ -186,15 +186,15 @@ foreach ($databaseUsers as $user) {
         case 1:
             $entry = ldap_first_entry($ldap, $searchResult);
             if (false === $entry) {
-                die('ldap_first_entry() failed: '.ldap_error($ldap)."\n");
+                exit('ldap_first_entry() failed: '.ldap_error($ldap)."\n");
             }
             $ldapCASUser = ldap_get_values($ldap, $entry, $ldapCASUserAttribute)[0];
             if (false === $ldapCASUser) {
-                die('cannot read CAS user code from LDAP entry: '.ldap_error($ldap)."\n");
+                exit('cannot read CAS user code from LDAP entry: '.ldap_error($ldap)."\n");
             }
             $ldapUsername = ldap_get_values($ldap, $entry, $ldapUsernameAttribute)[0];
             if (false === $ldapUsername) {
-                die('cannot read username from LDAP entry: '.ldap_error($ldap)."\n");
+                exit('cannot read username from LDAP entry: '.ldap_error($ldap)."\n");
             }
             echo "\033[2K\r$ldapUsernameAttribute: $ldapUsername, $ldapCASUserAttribute: $ldapCASUser, ";
             $problems = [];
@@ -213,7 +213,7 @@ foreach ($databaseUsers as $user) {
                     $userNamesInUse[$ldapUsername] = $userId;
                 }
             } else {
-                die("LDAP search result does not match username; our filter is wrong: $filter\n");
+                exit("LDAP search result does not match username; our filter is wrong: $filter\n");
             }
             if (array_key_exists($userId, $existingCasUserValues)) {
                 $currentValue = $existingCasUserValues[$userId];
@@ -308,7 +308,7 @@ if ($fixUsernames || $fixWrongAuthSources || $fixWrongCASCodes || $fixMissingCAS
                 UserManager::getManager()->save($user);
             } catch (Exception $exception) {
                 echo $exception->getMessage()."\n";
-                die("Script stopped before the end.\n");
+                exit("Script stopped before the end.\n");
             }
         }
         if ($fixMissingCASCodes && array_key_exists($userId, $missingCASCodes)) {
diff --git a/main/admin/ldap_import_students.php b/main/admin/ldap_import_students.php
index b57043edbd..21971b71c1 100755
--- a/main/admin/ldap_import_students.php
+++ b/main/admin/ldap_import_students.php
@@ -88,7 +88,7 @@ if (empty($annee) && empty($course)) {
     echo '<br />';
     echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
     //echo "Connection ...";
-    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    $ds = ldap_connect($ldap_host, $ldap_port) or exit(get_lang('LDAPConnectionError'));
     ldap_set_version($ds);
 
     if ($ds) {
diff --git a/main/admin/ldap_import_students_to_session.php b/main/admin/ldap_import_students_to_session.php
index 4c555a40b5..97222909a5 100755
--- a/main/admin/ldap_import_students_to_session.php
+++ b/main/admin/ldap_import_students_to_session.php
@@ -94,7 +94,7 @@ elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed'])) {
     echo '<br />';
     echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
     //echo "Connection ...";
-    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    $ds = ldap_connect($ldap_host, $ldap_port) or exit(get_lang('LDAPConnectionError'));
     ldap_set_version($ds);
     if ($ds) {
         $r = false;
diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php
index 18e1aac190..29990c16ca 100644
--- a/main/admin/teacher_time_report.php
+++ b/main/admin/teacher_time_report.php
@@ -354,7 +354,7 @@ if (isset($_GET['export'])) {
             Export::export_table_xls_html($dataToExport, $fileName);
             break;
     }
-    die;
+    exit;
 }
 
 $form->addSelect(
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
index 40b8af3d24..f0b91ac1e5 100755
--- a/main/admin/user_move_stats.php
+++ b/main/admin/user_move_stats.php
@@ -145,7 +145,7 @@ Display::addFlash(
     )
 );
 Display::display_header(get_lang('MoveUserStats'));
-echo  '<div class="actions">';
+echo '<div class="actions">';
 echo '<a href="../admin/index.php">'.
     Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
diff --git a/main/auth/conditional_login/complete_phone_number.php b/main/auth/conditional_login/complete_phone_number.php
index e4cf738d9a..8bb45f2216 100755
--- a/main/auth/conditional_login/complete_phone_number.php
+++ b/main/auth/conditional_login/complete_phone_number.php
@@ -5,7 +5,7 @@ require_once __DIR__.'/../../inc/global.inc.php';
 $url = api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
 if (!isset($_SESSION['conditional_login']['uid'])) {
-    die("Not Authorised");
+    exit("Not Authorised");
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/main/auth/external_login/ldap.inc.php b/main/auth/external_login/ldap.inc.php
index d888ed6fd3..cdd652f07e 100755
--- a/main/auth/external_login/ldap.inc.php
+++ b/main/auth/external_login/ldap.inc.php
@@ -462,7 +462,6 @@ function extldapGetUserAttributeValue($filter, $attribute)
                 return $values[0];
             }
             throw new Exception(get_lang('MoreThanOneAttributeValueFound'));
-            // no break;
         default:
             throw new Exception(get_lang('MoreThanOneUserMatched'));
     }
diff --git a/main/auth/external_login/ldap_import_all_users.php b/main/auth/external_login/ldap_import_all_users.php
index 3192eef4d3..6ed73df3e2 100755
--- a/main/auth/external_login/ldap_import_all_users.php
+++ b/main/auth/external_login/ldap_import_all_users.php
@@ -10,7 +10,7 @@
  * Init.
  */
 if (PHP_SAPI != 'cli') {
-    die('For security reasons, this script can only be launched from cron or from the command line');
+    exit('For security reasons, this script can only be launched from cron or from the command line');
 }
 
 require __DIR__.'/../../inc/global.inc.php';
diff --git a/main/calendar/ical_export.php b/main/calendar/ical_export.php
index 077ba8e3a1..8311073612 100755
--- a/main/calendar/ical_export.php
+++ b/main/calendar/ical_export.php
@@ -161,7 +161,7 @@ if (!empty($event)) {
             break;
         default:
             header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));
-            die();
+            exit();
     }
 } else {
     header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));
diff --git a/main/cron/archive_table_records.php b/main/cron/archive_table_records.php
index 4cdd343de2..320b540869 100644
--- a/main/cron/archive_table_records.php
+++ b/main/cron/archive_table_records.php
@@ -25,7 +25,7 @@
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
  */
 if (php_sapi_name() !== 'cli') {
-    die("This script must be run from the command-line. Goodbye.\n");
+    exit("This script must be run from the command-line. Goodbye.\n");
 }
 require __DIR__.'/../../main/inc/global.inc.php';
 ini_set('max_execution_time', 0);
@@ -42,7 +42,7 @@ $archiveNumber = 5000000;
 foreach ($tables as $table) {
     $tableArchive = $table.'_'.date('Y');
     if (!checkAndCreateTable($tableArchive, $table)) {
-        die("Could not create table $tableArchive. Please check your database user has the CREATE TABLE permission.\n");
+        exit("Could not create table $tableArchive. Please check your database user has the CREATE TABLE permission.\n");
     }
     $sql = "SELECT count(*) FROM $table";
     $res = Database::query($sql);
diff --git a/main/cron/document/finddoc.php b/main/cron/document/finddoc.php
index fc59b71f3b..394ed01e06 100755
--- a/main/cron/document/finddoc.php
+++ b/main/cron/document/finddoc.php
@@ -5,7 +5,7 @@
 /**
  * Code init - comment die() call to enable.
  */
-die();
+exit();
 require '../../inc/global.inc.php';
 if (empty($_GET['doc'])) {
     echo "To add a document name to search, add ?doc=abc to the URL";
diff --git a/main/cron/document/index_all_docs.php b/main/cron/document/index_all_docs.php
index aca4064490..8bbf96a720 100755
--- a/main/cron/document/index_all_docs.php
+++ b/main/cron/document/index_all_docs.php
@@ -5,7 +5,7 @@
 /**
  * Code init - comment die() call to enable.
  */
-die();
+exit();
 require '../../inc/global.inc.php';
 if (empty($_GET['doc'])) {
     echo "To add a document name to search, add ?doc=abc to the URL\n";
diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index a5c09b03e1..3f0cbf1a46 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -12,7 +12,7 @@ use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
 if (PHP_SAPI != 'cli') {
-    die('Run this script through the command line or comment this line in the code');
+    exit('Run this script through the command line or comment this line in the code');
 }
 
 if (file_exists('multiple_url_fix.php')) {
diff --git a/main/cron/lang/check_parse_lang.php b/main/cron/lang/check_parse_lang.php
index af27d451e1..66c32fc81a 100755
--- a/main/cron/lang/check_parse_lang.php
+++ b/main/cron/lang/check_parse_lang.php
@@ -1,4 +1,5 @@
-<?php /* For licensing terms, see /license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
  * Script to check that no language file has parse errors.
  *
diff --git a/main/cron/lang/langstats.php b/main/cron/lang/langstats.php
index 36b02c300d..6a47122982 100755
--- a/main/cron/lang/langstats.php
+++ b/main/cron/lang/langstats.php
@@ -11,7 +11,7 @@
 /**
  * Requires.
  */
-die();
+exit();
 require_once '../../inc/global.inc.php';
 require_once 'langstats.class.php';
 /**
diff --git a/main/cron/lang/list_undefined_langvars.php b/main/cron/lang/list_undefined_langvars.php
index 90b2d11bb1..3cecdd2aed 100755
--- a/main/cron/lang/list_undefined_langvars.php
+++ b/main/cron/lang/list_undefined_langvars.php
@@ -1,4 +1,5 @@
-<?php /* For licensing terms, see /license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
  * Cron script to list used, but undefined, language variables.
  *
@@ -7,7 +8,7 @@
 /**
  * Includes and declarations.
  */
-die();
+exit();
 require_once __DIR__.'/../../inc/global.inc.php';
 $path = api_get_path(SYS_LANG_PATH).'english';
 ini_set('memory_limit', '128M');
@@ -67,7 +68,7 @@ foreach ($files as $file) {
 }
 //$undefined_terms = array_flip($undefined_terms);
 if (count($undefined_terms) < 1) {
-    die("No missing terms<br />\n");
+    exit("No missing terms<br />\n");
 } else {
     echo "The following terms were nowhere to be found: <br />\n<table>";
 }
diff --git a/main/cron/lang/list_unused_langvars.php b/main/cron/lang/list_unused_langvars.php
index 68154b99e5..483e0574e7 100755
--- a/main/cron/lang/list_unused_langvars.php
+++ b/main/cron/lang/list_unused_langvars.php
@@ -1,4 +1,5 @@
-<?php /* For licensing terms, see /license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
  * Cron script to list unused, but defined, language variables.
  *
@@ -7,7 +8,7 @@
 /**
  * Includes and declarations.
  */
-die();
+exit();
 require_once __DIR__.'/../../inc/global.inc.php';
 $path = api_get_path(SYS_LANG_PATH).'english';
 ini_set('memory_limit', '128M');
@@ -110,7 +111,7 @@ foreach ($files as $file) {
 // defined terms, and this should prove the concept that there are much
 // more variables than what we really use
 if (count($usedTerms) < 1) {
-    die("No used terms<br />\n");
+    exit("No used terms<br />\n");
 } else {
     echo "The following terms were defined but never used: <br />\n<table>";
 }
diff --git a/main/cron/lang/switch_files_to_gettext.php b/main/cron/lang/switch_files_to_gettext.php
index 690f404b89..22acd668b8 100755
--- a/main/cron/lang/switch_files_to_gettext.php
+++ b/main/cron/lang/switch_files_to_gettext.php
@@ -8,7 +8,7 @@
 /**
  * Includes and declarations.
  */
-die();
+exit();
 require_once __DIR__.'/../../inc/global.inc.php';
 $path = api_get_path(SYS_LANG_PATH).'english';
 ini_set('memory_limit', '128M');
diff --git a/main/cron/notification.php b/main/cron/notification.php
index b977404892..f69fb0a2fb 100755
--- a/main/cron/notification.php
+++ b/main/cron/notification.php
@@ -6,7 +6,7 @@
  * @author Julio Montoya <gugli100@gmail.com>
  */
 if (PHP_SAPI !== 'cli') {
-    die('Run this script through the command line or comment this line in the code');
+    exit('Run this script through the command line or comment this line in the code');
 }
 
 require_once __DIR__.'/../inc/global.inc.php';
diff --git a/main/cron/user_import/client.php b/main/cron/user_import/client.php
index 843b0c84f1..5e5d734239 100755
--- a/main/cron/user_import/client.php
+++ b/main/cron/user_import/client.php
@@ -19,7 +19,7 @@ require_once __DIR__.'/../../inc/global.inc.php';
 // check if this client has been called by php_cli (command line or cron)
 if (php_sapi_name() != 'cli') {
     echo 'You can\'t call this service through a browser';
-    die();
+    exit();
 }
 
 // create client
diff --git a/main/cron/user_import/get_data_from_mail.php b/main/cron/user_import/get_data_from_mail.php
index 8e4fb171bc..1ecb3fff2a 100755
--- a/main/cron/user_import/get_data_from_mail.php
+++ b/main/cron/user_import/get_data_from_mail.php
@@ -14,7 +14,7 @@ sam@example.com
 Matthew@example.com
 HERMAN@example.com
 */
-die();
+exit();
 //change filename depending on file containing mails list
 $list = file('input.txt');
 require_once '../../inc/global.inc.php';
diff --git a/main/cron/user_import/resend_email_with_new_password.php b/main/cron/user_import/resend_email_with_new_password.php
index 8854b17fa4..cf0030ebba 100755
--- a/main/cron/user_import/resend_email_with_new_password.php
+++ b/main/cron/user_import/resend_email_with_new_password.php
@@ -18,7 +18,7 @@
   Matthew@example.com
   HERMAN@example.com
  */
-die();
+exit();
 //change filename depending on file containing mails list, with one e-mail per line.
 $list = file('input.txt');
 require_once '../../inc/global.inc.php';
diff --git a/main/document/edit_draw.php b/main/document/edit_draw.php
index e89273bc04..2b85a85ec2 100755
--- a/main/document/edit_draw.php
+++ b/main/document/edit_draw.php
@@ -150,7 +150,7 @@ if (api_browser_support('svg')) {
     $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
     $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit; ?>
     <script>
-    document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
+    document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
     function resizeIframe() {
         var height = window.innerHeight -50;
         //max lower size
diff --git a/main/document/edit_paint.php b/main/document/edit_paint.php
index c03e0c4a95..f49cbf4c4b 100755
--- a/main/document/edit_paint.php
+++ b/main/document/edit_paint.php
@@ -212,7 +212,7 @@ $pixlr_url = '//pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'
 //make frame an send image
 ?>
 <script>
-document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $pixlr_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
+document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo $pixlr_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
 function resizeIframe() {
     var height = window.innerHeight;
     //max lower size
diff --git a/main/document/remote.php b/main/document/remote.php
index 79129dd90d..09c4e6cd14 100755
--- a/main/document/remote.php
+++ b/main/document/remote.php
@@ -33,7 +33,7 @@ $user_id = api_get_user_id();
 $coursePath = api_get_path(SYS_COURSE_PATH).$cidReq.'/document';
 $_course = api_get_course_info($cidReq);
 if (empty($_course)) {
-    die("problem when fetching course information");
+    exit("problem when fetching course information");
 }
 // stupid variable initialisation for old version of DocumentManager functions.
 $_course['path'] = $_course['directory'];
@@ -60,7 +60,7 @@ if (strlen($cwd) == 0) {
     $cwd = '/';
 }
 if (Security::check_abs_path($cwd, api_get_path(SYS_PATH))) {
-    die();
+    exit();
 }
 if ($action == 'list') {
     /*==== List files ====*/
diff --git a/main/document/save_pixlr.php b/main/document/save_pixlr.php
index a1c33d0f54..1c6faf2de3 100755
--- a/main/document/save_pixlr.php
+++ b/main/document/save_pixlr.php
@@ -88,7 +88,7 @@ if ($contents === false) {
 
 // Extension security
 if ($extension != 'jpg' && $extension != 'png' && $extension != 'pxd') {
-    die();
+    exit();
 }
 if ($extension == 'pxd') {
     echo "pxd file type does not supported";
diff --git a/main/document/webcam_receiver.php b/main/document/webcam_receiver.php
index 1eb61911fb..d462e13450 100755
--- a/main/document/webcam_receiver.php
+++ b/main/document/webcam_receiver.php
@@ -19,12 +19,12 @@ if (isset($params['webcamname']) && isset($params['webcamdir']) && isset($params
     $webcamuserid = $params['webcamuserid'];
 } else {
     api_not_allowed();
-    die();
+    exit();
 }
 
 if ($webcamuserid != api_get_user_id() || api_get_user_id() == 0 || $webcamuserid == 0) {
     api_not_allowed();
-    die();
+    exit();
 }
 
 //clean
diff --git a/main/dropbox/dropbox_class.inc.php b/main/dropbox/dropbox_class.inc.php
index 923b30b107..f957a8be05 100755
--- a/main/dropbox/dropbox_class.inc.php
+++ b/main/dropbox/dropbox_class.inc.php
@@ -324,7 +324,7 @@ class Dropbox_SentWork extends Dropbox_Work
         }
 
         if (!is_array($recipient_ids) || 0 == count($recipient_ids)) {
-            die(get_lang('GeneralError').' (code 209)');
+            exit(get_lang('GeneralError').' (code 209)');
         }
 
         foreach ($recipient_ids as $rec) {
@@ -542,7 +542,7 @@ class Dropbox_Person
 
         if (!$found) {
             if (!$this->deleteReceivedWorkFolder($id)) {
-                die(get_lang('GeneralError').' (code 216)');
+                exit(get_lang('GeneralError').' (code 216)');
             }
         }
         // Delete entries in person table concerning received works
@@ -573,7 +573,7 @@ class Dropbox_Person
         }
         if (!$found) {
             if (!$this->deleteReceivedWorkFolder($id)) {
-                die(get_lang('GeneralError').' (code 219)');
+                exit(get_lang('GeneralError').' (code 219)');
             }
         }
         //$file_id = $this->sentWork[$index]->id;
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index d9826464a7..b8667d6953 100755
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -816,7 +816,7 @@ function getUserOwningThisMailing($mailingPseudoId, $owner = 0, $or_die = '')
     $result = Database::query($sql);
 
     if (!($res = Database::fetch_array($result))) {
-        die(get_lang('GeneralError').' (code 901)');
+        exit(get_lang('GeneralError').' (code 901)');
     }
     if ($owner == 0) {
         return $res['uploader_id'];
@@ -824,7 +824,7 @@ function getUserOwningThisMailing($mailingPseudoId, $owner = 0, $or_die = '')
     if ($res['uploader_id'] == $owner) {
         return true;
     }
-    die(get_lang('GeneralError').' (code '.$or_die.')');
+    exit(get_lang('GeneralError').' (code '.$or_die.')');
 }
 
 /**
diff --git a/main/exercise/exercise_show.php b/main/exercise/exercise_show.php
index c5af42d4be..3f12ccd0b6 100755
--- a/main/exercise/exercise_show.php
+++ b/main/exercise/exercise_show.php
@@ -293,7 +293,7 @@ if (!empty($track_exercise_info)) {
 
             if ($is_allowedToEdit &&
                 RESULT_DISABLE_SHOW_SCORE_ATTEMPT_SHOW_ANSWERS_LAST_ATTEMPT_NO_FEEDBACK == $result_disabled
-            ){
+            ) {
                 $showTotalScoreAndUserChoicesInLastAttempt = true;
             }
             break;
diff --git a/main/extra/save_school_calendar.php b/main/extra/save_school_calendar.php
index 51a13c6d8c..c29c9bf410 100644
--- a/main/extra/save_school_calendar.php
+++ b/main/extra/save_school_calendar.php
@@ -55,7 +55,7 @@ foreach ($_POST as $index => $valeur) {
     ?>
     </td>
     </tr>
-    <input type=hidden name=aaa value=<?= serialize(Database::fetch_array($resultexam)); ?>/>
+    <input type=hidden name=aaa value=<?php echo serialize(Database::fetch_array($resultexam)); ?>/>
     <input type="submit" value="Sauvegarder" name="B1">
     <?php
     echo $id, $tableau;
diff --git a/main/extra/userInfo.php b/main/extra/userInfo.php
index a5888b8231..4aa0ad4b56 100644
--- a/main/extra/userInfo.php
+++ b/main/extra/userInfo.php
@@ -303,7 +303,7 @@ if ($displayMode == "viewDefEdit") {
         } ?>
         </SELECT>
          <?php
-         echo'<p></p>  ';
+         echo '<p></p>  ';
         if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed)) {
         } else {
             echo "<td>", get_lang('CourseManager'), "</td>\n";
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index 2e9815aef0..f58cea7778 100755
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -482,7 +482,7 @@ if (isset($_GET['deletelink'])) {
 if (!empty($course_to_crsind) && !isset($_GET['confirm'])) {
     GradebookUtils::block_students();
     if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
-        die('Error: movecat or moveeval not defined');
+        exit('Error: movecat or moveeval not defined');
     }
     $button = '<form name="confirm" method="post" action="'.api_get_self().'?confirm='
         .(isset($_GET['movecat']) ? '&movecat='.$moveCategoryId
diff --git a/main/gradebook/lib/be/result.class.php b/main/gradebook/lib/be/result.class.php
index 34945747a1..db65c354cd 100755
--- a/main/gradebook/lib/be/result.class.php
+++ b/main/gradebook/lib/be/result.class.php
@@ -217,7 +217,7 @@ class Result
             $sql .= ")";
             Database::query($sql);
         } else {
-            die('Error in Result add: required field empty');
+            exit('Error in Result add: required field empty');
         }
     }
 
@@ -248,7 +248,7 @@ class Result
 
             Database::query($sql);
         } else {
-            die('Error in Result add: required field empty');
+            exit('Error in Result add: required field empty');
         }
     }
 
diff --git a/main/gradebook/lib/be/surveylink.class.php b/main/gradebook/lib/be/surveylink.class.php
index 8023b92284..7b42ed0b85 100755
--- a/main/gradebook/lib/be/surveylink.class.php
+++ b/main/gradebook/lib/be/surveylink.class.php
@@ -76,7 +76,7 @@ class SurveyLink extends AbstractLink
     public function get_all_links()
     {
         if (empty($this->course_code)) {
-            die('Error in get_all_links() : course code not set');
+            exit('Error in get_all_links() : course code not set');
         }
         $tbl_survey = $this->get_survey_table();
         $sessionId = $this->get_session_id();
diff --git a/main/gradebook/lib/fe/linkaddeditform.class.php b/main/gradebook/lib/fe/linkaddeditform.class.php
index e34b99aec8..4ec1cdfa5c 100755
--- a/main/gradebook/lib/fe/linkaddeditform.class.php
+++ b/main/gradebook/lib/fe/linkaddeditform.class.php
@@ -37,7 +37,7 @@ class LinkAddEditForm extends FormValidator
             $link->set_session_id(api_get_session_id());
             $link->set_category_id($category_object[0]->get_id());
         } else {
-            die('LinkAddEditForm error: define link_type/category_object or link_object');
+            exit('LinkAddEditForm error: define link_type/category_object or link_object');
         }
 
         $defaults = [];
diff --git a/main/gradebook/lib/user_data_generator.class.php b/main/gradebook/lib/user_data_generator.class.php
index b56e31b5b7..55e8241ff7 100755
--- a/main/gradebook/lib/user_data_generator.class.php
+++ b/main/gradebook/lib/user_data_generator.class.php
@@ -339,9 +339,7 @@ class UserDataGenerator
         }
         $scoredisplay = ScoreDisplay::instance();
         $displaytype = SCORE_AVERAGE;
-        /*if ($ignore_score_color)
-            $displaytype |= SCORE_IGNORE_SPLIT;
-        */
+
         return $scoredisplay->display_score($avgscore, $displaytype);
     }
 
diff --git a/main/inc/ajax/admin.ajax.php b/main/inc/ajax/admin.ajax.php
index 8786f293ea..21447f4892 100755
--- a/main/inc/ajax/admin.ajax.php
+++ b/main/inc/ajax/admin.ajax.php
@@ -41,14 +41,14 @@ switch ($action) {
         $blockName = isset($_POST['block']) ? Security::remove_XSS($_POST['block']) : null;
 
         if (empty($blockName)) {
-            die;
+            exit;
         }
 
         if (api_is_multiple_url_enabled()) {
             $accessUrlId = api_get_current_access_url_id();
 
             if ($accessUrlId == -1) {
-                die;
+                exit;
             }
 
             $urlInfo = api_get_access_url($accessUrlId);
@@ -60,15 +60,15 @@ switch ($action) {
         }
 
         if (!file_exists($newUrlDir)) {
-            die;
+            exit;
         }
 
         if (!Security::check_abs_path("{$newUrlDir}{$blockName}_extra.html", $newUrlDir)) {
-            die;
+            exit;
         }
 
         if (!file_exists("{$newUrlDir}{$blockName}_extra.html")) {
-            die;
+            exit;
         }
 
         echo file_get_contents("{$newUrlDir}{$blockName}_extra.html");
diff --git a/main/inc/ajax/career.ajax.php b/main/inc/ajax/career.ajax.php
index 93f0746d19..ea8a7ce0fe 100644
--- a/main/inc/ajax/career.ajax.php
+++ b/main/inc/ajax/career.ajax.php
@@ -13,7 +13,6 @@ $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : null;
 
 switch ($action) {
     case 'get_promotions':
-
         $careerId = isset($_REQUEST['career_id']) ? (int) $_REQUEST['career_id'] : 0;
         $career = new Promotion();
         $promotions = $career->get_all_promotions_by_career_id($careerId);
diff --git a/main/inc/ajax/record_audio_wami.ajax.php b/main/inc/ajax/record_audio_wami.ajax.php
index 629c09ca4b..b130ab18b7 100755
--- a/main/inc/ajax/record_audio_wami.ajax.php
+++ b/main/inc/ajax/record_audio_wami.ajax.php
@@ -19,12 +19,12 @@ if (isset($params['waminame']) && isset($params['wamidir']) && isset($params['wa
     $wamiuserid = $params['wamiuserid'];
 } else {
     api_not_allowed();
-    die();
+    exit();
 }
 
 if (empty($wamiuserid)) {
     api_not_allowed();
-    die();
+    exit();
 }
 
 $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : 'document'; // can be document or message
@@ -49,7 +49,7 @@ $ext = explode('.', $waminame);
 $ext = strtolower($ext[sizeof($ext) - 1]);
 
 if ($ext != 'wav') {
-    die();
+    exit();
 }
 
 switch ($type) {
@@ -67,7 +67,7 @@ switch ($type) {
         $documentPath = $saveDir.'/'.$waminame_to_save;
 
         // Add to disk
-        $fh = fopen($documentPath, 'w') or die("can't open file");
+        $fh = fopen($documentPath, 'w') or exit("can't open file");
         fwrite($fh, $content);
         fclose($fh);
 
diff --git a/main/inc/ajax/session.ajax.php b/main/inc/ajax/session.ajax.php
index a3902b4499..81da8f2d01 100755
--- a/main/inc/ajax/session.ajax.php
+++ b/main/inc/ajax/session.ajax.php
@@ -307,7 +307,7 @@ switch ($action) {
                 }
             );
             $documentAndFolders = array_map(
-                function (array $documentData) use ($course, $session, $courseInfo, $currentUserId, $http_www, $folderName, $id) {
+                function (array $documentData) use ($course, $session, $folderName) {
                     $downloadUrl = api_get_path(WEB_CODE_PATH).'document/document.php?'
                         .api_get_cidreq_params($course->getCode(), $session->getId()).'&'
                         .http_build_query(['action' => 'download', 'id' => $documentData['id']]);
diff --git a/main/inc/global-min.inc.php b/main/inc/global-min.inc.php
index 6f40021422..7fb5337b47 100644
--- a/main/inc/global-min.inc.php
+++ b/main/inc/global-min.inc.php
@@ -30,7 +30,7 @@ if (file_exists($kernel->getConfigurationFile())) {
         $global_error_code = 2;
         // The system has not been installed yet.
         require_once __DIR__.'/../inc/global_error_message.inc.php';
-        die();
+        exit();
     }
 }
 
@@ -79,7 +79,7 @@ try {
     $global_error_code = 3;
     // The database server is not available or credentials are invalid.
     require $includePath.'/global_error_message.inc.php';
-    die();
+    exit();
 }
 
 /* RETRIEVING ALL THE CHAMILO CONFIG SETTINGS FOR MULTIPLE URLs FEATURE*/
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index d99a8e28f9..1f13b113c9 100755
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -44,7 +44,7 @@ if (file_exists($kernel->getConfigurationFile())) {
         $global_error_code = 2;
         // The system has not been installed yet.
         require_once __DIR__.'/../inc/global_error_message.inc.php';
-        die();
+        exit();
     }
 }
 
@@ -161,7 +161,7 @@ try {
     $global_error_code = 3;
     // The database server is not available or credentials are invalid.
     require $includePath.'/global_error_message.inc.php';
-    die();
+    exit();
 }
 
 /* RETRIEVING ALL THE CHAMILO CONFIG SETTINGS FOR MULTIPLE URLs FEATURE*/
diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php
index 0facec7290..c3ce174e85 100755
--- a/main/inc/global_error_message.inc.php
+++ b/main/inc/global_error_message.inc.php
@@ -320,5 +320,5 @@ EOM;
         $global_error_message_page = str_replace('{'.strtoupper($key).'}', $value, $global_error_message_page);
     }
     header('Content-Type: text/html; charset='.$global_error_message['encoding']);
-    die($global_error_message_page);
+    exit($global_error_message_page);
 }
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index a32b80b2ef..d6250dc005 100755
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -642,7 +642,7 @@ class CourseHome
 
         $allowEditionInSession = api_get_configuration_value('allow_edit_tool_visibility_in_session');
         // If exists same tool (by name) from session in base course then avoid it. Allow them pass in other cases
-        $tools = array_filter($tools, function (array $toolToFilter) use ($sessionId, $tools) {
+        $tools = array_filter($tools, function (array $toolToFilter) use ($tools) {
             if (!empty($toolToFilter['session_id'])) {
                 foreach ($tools as $originalTool) {
                     if ($toolToFilter['name'] == $originalTool['name'] && empty($originalTool['session_id'])) {
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index a59a503fc7..17f59c5a0b 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -2348,7 +2348,7 @@ class Display
         }
         $link = self::url($label.' ', $link_to_show, $linkAttributes);
 
-        return  '<li class = "'.$class.'">'.$link.'</li>';
+        return '<li class = "'.$class.'">'.$link.'</li>';
     }
 
     /**
diff --git a/main/inc/lib/extra_field_option.lib.php b/main/inc/lib/extra_field_option.lib.php
index fa0ba94585..c2a6b93f23 100755
--- a/main/inc/lib/extra_field_option.lib.php
+++ b/main/inc/lib/extra_field_option.lib.php
@@ -735,7 +735,7 @@ class ExtraFieldOption extends Model
      */
     public function getPriorityOptions()
     {
-        return  [
+        return [
             '' => get_lang('SelectAnOption'),
             1 => get_lang('Success'),
             2 => get_lang('Info'),
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 3ba19e2886..3c2f3d7752 100755
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -1620,10 +1620,10 @@ function search_img_from_html($html_file)
         $buffer = fread($fp, $size_file);
         if (strlen($buffer) >= 0 && $buffer !== false) {
         } else {
-            die('<center>Can not read file.</center>');
+            exit('<center>Can not read file.</center>');
         }
     } else {
-        die('<center>Can not read file.</center>');
+        exit('<center>Can not read file.</center>');
     }
     $matches = [];
     if (preg_match_all('~<[[:space:]]*img[^>]*>~i', $buffer, $matches)) {
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 3a7a0b1bc5..c0e6987824 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -2883,7 +2883,7 @@ class GroupManager
             case 'settings':
                 $activeSettings = 'active';
                 break;
-            case'tutor':
+            case 'tutor':
                 $activeTutor = 'active';
                 break;
             case 'member':
diff --git a/main/inc/lib/legal.lib.php b/main/inc/lib/legal.lib.php
index 18525a0e3c..097486f8f0 100755
--- a/main/inc/lib/legal.lib.php
+++ b/main/inc/lib/legal.lib.php
@@ -437,7 +437,7 @@ class LegalManager
      */
     public static function getTreatmentTypeList()
     {
-        return  [
+        return [
             'privacy_terms_collection' => 'collection',
             'privacy_terms_recording' => 'recording',
             'privacy_terms_organization' => 'organization',
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index d36d97f600..08bb1df39e 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -1476,7 +1476,6 @@ class MessageManager
                         get_lang('Me').'</b>';
                     break;
                 case self::MESSAGE_TYPE_OUTBOX:
-
                     $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.
                         $receiverUserInfo['complete_name_with_username'].'</b>';
                     break;
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 32c495f067..1e1dfae525 100755
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -827,7 +827,7 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
             include api_get_path(SYS_CODE_PATH).'auth/openid/login.php';
             openid_begin(trim($_POST['openid_url']), api_get_path(WEB_PATH).'index.php');
             //this last function should trigger a redirect, so we can die here safely
-            die('Openid login redirection should be in progress');
+            exit('Openid login redirection should be in progress');
         } elseif (!empty($_GET['openid_identity'])) { //it's usual for PHP to replace '.' (dot) by '_' (underscore) in URL parameters
             include api_get_path(SYS_CODE_PATH).'auth/openid/login.php';
             $res = openid_complete($_GET);
@@ -1365,7 +1365,6 @@ if ((isset($uidReset) && $uidReset) || $cidReset) {
                                     }
                                     break;
                                 case '0': //Student
-
                                     $is_courseMember = true;
                                     $is_courseTutor = false;
                                     $is_courseAdmin = false;