diff --git a/main/admin/course_request_review.php b/main/admin/course_request_review.php
index 2cc8a185ac..c3b420952c 100755
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
@@ -188,8 +188,8 @@ function modify_filter($id)
 {
     $code = CourseRequestManager::get_course_request_code($id);
     $result = '<a href="course_request_edit.php?id='.$id.'&caller=0">'.Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align: middle;')).'</a>'.
-        '&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>'.
-        '&nbsp;<a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>';
+        '&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>'.
+        '&nbsp;<a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>';
     if (!CourseRequestManager::additional_info_asked($id)) {
         $result .= '&nbsp;<a href="?request_info='.$id.'">'.Display::return_icon('request_info.gif', get_lang('AskAdditionalInfo'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('AdditionalInfoWillBeAsked'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
     }
diff --git a/main/admin/skill_badge.php b/main/admin/skill_badge.php
index d213931a4e..7abbec575d 100644
--- a/main/admin/skill_badge.php
+++ b/main/admin/skill_badge.php
@@ -23,14 +23,14 @@ if (strcmp($backpack, $configBackpack) !== 0) {
 
 $interbreadcrumb = array(
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
         'name' => get_lang('Administration')
     )
 );
 
 $toolbar = Display::toolbarButton(
     get_lang('ManageSkills'),
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
     'list',
     'primary',
     ['title' => get_lang('ManageSkills')]
diff --git a/main/admin/skill_badge_list.php b/main/admin/skill_badge_list.php
index 153cfe7dd5..5904ebc644 100644
--- a/main/admin/skill_badge_list.php
+++ b/main/admin/skill_badge_list.php
@@ -30,18 +30,18 @@ $skills = $objSkill->get_all();
 
 $interbreadcrumb = array(
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
         'name' => get_lang('Administration')
     ),
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
         'name' => get_lang('Badges')
     )
 );
 
 $toolbar = Display::toolbarButton(
     get_lang('ManageSkills'),
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
     'list',
     'primary',
     ['title' => get_lang('ManageSkills')]
diff --git a/main/admin/teacher_time_report.php b/main/admin/teacher_time_report.php
index e7112d0e49..200090cf66 100644
--- a/main/admin/teacher_time_report.php
+++ b/main/admin/teacher_time_report.php
@@ -294,7 +294,7 @@ $timeReport->sortData($withFilter);
 if (isset($_GET['export'])) {
     $dataToExport = $timeReport->prepareDataToExport($withFilter);
 
-    $fileName = get_lang('TeacherTimeReport') . ' ' . api_get_local_time();
+    $fileName = get_lang('TeacherTimeReport').' '.api_get_local_time();
 
     switch ($_GET['export']) {
         case 'pdf':
diff --git a/main/badge/class.php b/main/badge/class.php
index 72e36322a8..7547ef7ebe 100644
--- a/main/badge/class.php
+++ b/main/badge/class.php
@@ -18,9 +18,9 @@ $skill = $objSkill->get($skillId);
 $json = array(
     'name' => $skill['name'],
     'description' => $skill['description'],
-    'image' => api_get_path(WEB_UPLOAD_PATH) . "badges/{$skill['icon']}",
-    'criteria' => api_get_path(WEB_CODE_PATH) . "badge/criteria.php?id=$skillId",
-    'issuer' => api_get_path(WEB_CODE_PATH) . "badge/issuer.php",
+    'image' => api_get_path(WEB_UPLOAD_PATH)."badges/{$skill['icon']}",
+    'criteria' => api_get_path(WEB_CODE_PATH)."badge/criteria.php?id=$skillId",
+    'issuer' => api_get_path(WEB_CODE_PATH)."badge/issuer.php",
 );
 
 echo json_encode($json);
diff --git a/main/badge/criteria.php b/main/badge/criteria.php
index 5a7eff00a0..280def9789 100644
--- a/main/badge/criteria.php
+++ b/main/badge/criteria.php
@@ -16,7 +16,7 @@ if (!$skill) {
         Display::return_message(get_lang('SkillNotFound'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 
diff --git a/main/calendar/agenda_js.php b/main/calendar/agenda_js.php
index e97a94b345..941af60be8 100755
--- a/main/calendar/agenda_js.php
+++ b/main/calendar/agenda_js.php
@@ -36,7 +36,7 @@ if (api_is_platform_admin() && ($type == 'admin' || $type == 'platform')) {
 if (isset($_REQUEST['cidReq']) && !empty($_REQUEST['cidReq'])) {
     if ($_REQUEST['cidReq'] == -1) {
         // When is out of the course tool (e.g My agenda)
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
     } else {
         $type = 'course';
diff --git a/main/course_info/maintenance_coach.php b/main/course_info/maintenance_coach.php
index afa47b9bbc..ad41b3e33c 100644
--- a/main/course_info/maintenance_coach.php
+++ b/main/course_info/maintenance_coach.php
@@ -27,12 +27,12 @@ Display :: display_header($nameTools);
 echo Display::page_subheader(
     Display::return_icon(
         'save_import.gif', get_lang('Backup')
-    ) . '&nbsp;&nbsp;' . get_lang('Backup')
+    ).'&nbsp;&nbsp;'.get_lang('Backup')
 );
 
 $url = api_get_path(
         WEB_CODE_PATH
-    ) . 'coursecopy/copy_course_session_selected.php?' . api_get_cidreq();
+    ).'coursecopy/copy_course_session_selected.php?'.api_get_cidreq();
 
 $link = Display::url(get_lang('CopyCourse'), $url);
 ?>
diff --git a/main/dashboard/index.php b/main/dashboard/index.php
index d52c666d2b..ca62223c6f 100755
--- a/main/dashboard/index.php
+++ b/main/dashboard/index.php
@@ -20,12 +20,12 @@ api_block_anonymous_users();
 
 // current section
 $this_section = SECTION_DASHBOARD;
-unset($_SESSION['this_section']);//for hmtl editor repository
+unset($_SESSION['this_section']); //for hmtl editor repository
 
 // get actions
 $actions = array('listing', 'store_user_block', 'disable_block');
 $action = 'listing';
-if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
+if (isset($_GET['action']) && in_array($_GET['action'], $actions)) {
 	$action = $_GET['action'];
 }
 
diff --git a/main/document/edit_odf.php b/main/document/edit_odf.php
index 3e2e824bf7..1e6cf51b61 100755
--- a/main/document/edit_odf.php
+++ b/main/document/edit_odf.php
@@ -39,7 +39,7 @@ $show_web_odf = false;
 $web_odf_supported_files = DocumentManager::get_web_odf_extension_list();
 
 if (in_array(strtolower($pathinfo['extension']), $web_odf_supported_files)) {
-    $show_web_odf  = true;
+    $show_web_odf = true;
 }
 
 $file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file;
@@ -90,8 +90,8 @@ if (empty($document_data['parents'])) {
 echo Display::display_header('');
 
 echo '<div class="actions">';
-echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
-echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png',get_lang('Rename').'/'.get_lang('Comments'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="document.php?id='.$parent_id.'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), '', ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="edit_document.php?'.api_get_cidreq().'&id='.$document_id.$req_gid.'&origin=editodf">'.Display::return_icon('edit.png', get_lang('Rename').'/'.get_lang('Comments'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 // echo '<div id="odf"></div>';
diff --git a/main/gradebook/gradebook_add_eval.php b/main/gradebook/gradebook_add_eval.php
index 23677ac18a..663d907767 100755
--- a/main/gradebook/gradebook_add_eval.php
+++ b/main/gradebook/gradebook_add_eval.php
@@ -30,7 +30,7 @@ $form = new EvalForm(
     null,
     'add_eval_form',
     null,
-    api_get_self() . '?selectcat=' . $select_cat.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
 );
 
 if ($form->validate()) {
@@ -69,23 +69,23 @@ if ($form->validate()) {
             //header('Location: gradebook_add_user.php?selecteval=' . $eval->get_id());
             exit;
         } else {
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
             exit;
         }
     } else {
         $val_addresult = isset($values['addresult']) ? $values['addresult'] : null;
         if ($val_addresult == 1) {
-            header('Location: gradebook_add_result.php?selecteval=' . $eval->get_id().'&'.api_get_cidreq());
+            header('Location: gradebook_add_result.php?selecteval='.$eval->get_id().'&'.api_get_cidreq());
             exit;
         } else {
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
             exit;
         }
     }
 }
 
 $interbreadcrumb[] = array(
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $select_cat.'&'.api_get_cidreq(),
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$select_cat.'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook'))
 ;
 $this_section = SECTION_COURSES;
@@ -96,7 +96,7 @@ $(document).ready( function() {
        $("#hid_category_id option:selected").each(function () {
            var cat_id = $(this).val();
             $.ajax({
-                url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight",
+                url: "' . api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight",
                 data: "cat_id="+cat_id,
                 success: function(return_value) {
                     if (return_value != 0 ) {
diff --git a/main/gradebook/gradebook_scoring_system.php b/main/gradebook/gradebook_scoring_system.php
index 1a04f6a8f8..70d344fcc7 100755
--- a/main/gradebook/gradebook_scoring_system.php
+++ b/main/gradebook/gradebook_scoring_system.php
@@ -13,7 +13,7 @@ if (api_get_setting('teachers_can_change_score_settings') != 'true') {
     api_not_allowed();
 }
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 function plusItem(item) {
     document.getElementById(item).style.display = "inline";
     document.getElementById("plus-"+item).style.display = "none";
@@ -45,10 +45,10 @@ $interbreadcrumb[] = array(
 );
 
 $select_cat = intval($_GET['selectcat']);
-$displayscore= ScoreDisplay :: instance();
+$displayscore = ScoreDisplay :: instance();
 $customdisplays = $displayscore->get_custom_score_display_settings();
 
-$nr_items = (count($customdisplays) != '0' )? count($customdisplays) : '1';
+$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
 $scoreform = new ScoreDisplayForm(
     'scoring_system_form',
     api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
@@ -57,18 +57,18 @@ $scoreform = new ScoreDisplayForm(
 if ($scoreform->validate()) {
     $value_export = '';
     $value_export = $scoreform->exportValues();
-    $value_export = isset($value_export) ? $scoreform->exportValues(): '';
+    $value_export = isset($value_export) ? $scoreform->exportValues() : '';
     $values = $value_export;
 
     // create new array of custom display settings
     // this loop also checks if all score ranges are unique
 
-    $scoringdisplay= array ();
+    $scoringdisplay = array();
     $ranges_ok = true;
-    $endscore= isset($values['endscore']) ? $values['endscore'] : null;
-    $displaytext=isset($values['displaytext']) ? $values['displaytext'] : null;
-    for ($counter= 1; $ranges_ok && $counter <= 20; $counter++) {
-        $setting= array ();
+    $endscore = isset($values['endscore']) ? $values['endscore'] : null;
+    $displaytext = isset($values['displaytext']) ? $values['displaytext'] : null;
+    for ($counter = 1; $ranges_ok && $counter <= 20; $counter++) {
+        $setting = array();
         $setting['score'] = $endscore[$counter];
         $setting['display'] = $displaytext[$counter];
         if (!empty($setting['score'])) {
@@ -77,12 +77,12 @@ if ($scoreform->validate()) {
                     $ranges_ok = false;
                 }
             }
-            $scoringdisplay[]= $setting;
+            $scoringdisplay[] = $setting;
         }
     }
 
     if (!$ranges_ok) {
-        header('Location: ' . api_get_self() . '?nouniqueranges=&selectcat=' . $select_cat.'&'.api_get_cidreq());
+        header('Location: '.api_get_self().'?nouniqueranges=&selectcat='.$select_cat.'&'.api_get_cidreq());
         exit;
     }
 
@@ -102,8 +102,8 @@ if ($scoreform->validate()) {
 $this_section = SECTION_COURSES;
 Display :: display_header(get_lang('ScoreEdit'));
 
-if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') ||
-    (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))
+if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
+    (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
 ) {
     if (isset ($_GET['scoringupdated'])) {
         Display::display_confirmation_message(get_lang('ScoringUpdated'), false);
diff --git a/main/gradebook/lib/be/evallink.class.php b/main/gradebook/lib/be/evallink.class.php
index e604c10e3a..a209eea518 100755
--- a/main/gradebook/lib/be/evallink.class.php
+++ b/main/gradebook/lib/be/evallink.class.php
@@ -47,10 +47,10 @@ abstract class EvalLink extends AbstractLink
         $eval = $this->get_evaluation();
         // course/platform admin can go to the view_results page
         if (api_is_allowed_to_edit()) {
-            return 'gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } // students can go to the statistics page (if custom display enabled)
         elseif (ScoreDisplay :: instance()->is_custom()) {
-            return 'gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
+            return 'gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
         } else {
             return null;
         }
@@ -176,8 +176,8 @@ abstract class EvalLink extends AbstractLink
                 $eval = new Evaluation();
                 $eval->set_category_id(-1);
                 $eval->set_date(api_get_utc_datetime()); // these values will be changed
-                $eval->set_weight(0);    //   when the link setter
-                $eval->set_visible(0);   //     is called
+                $eval->set_weight(0); //   when the link setter
+                $eval->set_visible(0); //     is called
                 $eval->set_id(-1); // a 'real' id will be set when eval is added to db
                 $eval->set_user_id($this->get_user_id());
                 $eval->set_course_code($this->get_course_code());
diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php
index 58428062ae..f4785bc145 100755
--- a/main/gradebook/lib/fe/catform.class.php
+++ b/main/gradebook/lib/fe/catform.class.php
@@ -54,15 +54,15 @@ class CatForm extends FormValidator
      */
     protected function build_move_form()
     {
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement(
             'static',
             null,
             null,
-            '"' . $this->category_object->get_name() . '" '
+            '"'.$this->category_object->get_name().'" '
         );
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = null;
         foreach ($this->category_object->get_target_categories() as $cat) {
@@ -70,9 +70,9 @@ class CatForm extends FormValidator
                 $line .= '--';
             }
             if ($cat[0] != $this->category_object->get_parent_id()) {
-                $select->addoption($line . ' ' . $cat[1], $cat[0]);
+                $select->addoption($line.' '.$cat[1], $cat[0]);
             } else {
-                $select->addoption($line . ' ' . $cat[1], $cat[0], 'disabled');
+                $select->addoption($line.' '.$cat[1], $cat[0], 'disabled');
             }
             $line = '';
         }
@@ -155,7 +155,7 @@ class CatForm extends FormValidator
         $grade_model_id = $this->category_object->get_grade_model_id();
 
         if (empty($links)) {
-            $grade_model_id    = 0;
+            $grade_model_id = 0;
         }
 
         $category_name = $this->category_object->get_name();
@@ -244,7 +244,7 @@ class CatForm extends FormValidator
                     [
                         'id' => 'skills',
                         'multiple' => 'multiple',
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'skill.ajax.php?a=search_skills'
+                        'url' => api_get_path(WEB_AJAX_PATH).'skill.ajax.php?a=search_skills'
                     ]
                 );
 
@@ -390,14 +390,14 @@ class CatForm extends FormValidator
         //only return courses that are not yet created by the teacher
 
         foreach ($coursecat as $row) {
-            $select->addoption($row[1],$row[0]);
+            $select->addoption($row[1], $row[0]);
         }
         $this->setDefaults(array(
             'hid_user_id' => $this->category_object->get_user_id(),
             'hid_parent_id' => $this->category_object->get_parent_id()
         ));
-        $this->addElement('hidden','hid_user_id');
-        $this->addElement('hidden','hid_parent_id');
+        $this->addElement('hidden', 'hid_user_id');
+        $this->addElement('hidden', 'hid_parent_id');
         $this->addElement('submit', null, get_lang('Ok'));
     }
 
diff --git a/main/gradebook/my_certificates.php b/main/gradebook/my_certificates.php
index 8cbb321fd5..7ee920e852 100644
--- a/main/gradebook/my_certificates.php
+++ b/main/gradebook/my_certificates.php
@@ -37,7 +37,7 @@ if (api_get_setting('allow_public_certificates') === 'true') {
         'actions',
         Display::toolbarButton(
             get_lang('SearchCertificates'),
-            api_get_path(WEB_CODE_PATH) . "gradebook/search.php",
+            api_get_path(WEB_CODE_PATH)."gradebook/search.php",
             'search',
             'info'
         )
diff --git a/main/gradebook/user_stats.php b/main/gradebook/user_stats.php
index 31ca0e00a2..59801110dd 100755
--- a/main/gradebook/user_stats.php
+++ b/main/gradebook/user_stats.php
@@ -16,7 +16,7 @@ $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
 if (!$isDrhOfCourse) {
     GradebookUtils::block_students();
 }
-$interbreadcrumb[]= array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'],
     'name' => get_lang('Gradebook'
 ));
@@ -27,12 +27,12 @@ $allevals = $category[0]->get_evaluations($my_user_id, true);
 $alllinks = $category[0]->get_links($my_user_id, true);
 
 if ($_GET['selectcat'] != null) {
-    $addparams= array (
+    $addparams = array(
         'userid' => $my_user_id,
         'selectcat' => Security::remove_XSS($_GET['selectcat'])
     );
 } else {
-    $addparams= array (
+    $addparams = array(
         'userid' => $my_user_id,
         'selecteval' => Security::remove_XSS($_GET['selecteval'])
     );
@@ -49,7 +49,7 @@ if (isset ($_GET['exportpdf'])) {
         $newarray[] = array_slice($data, 1);
     }
     $userinfo = api_get_user_info($my_user_id);
-    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')';
+    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')';
 
     if ($displayscore->is_custom()) {
         $header_names = array(
@@ -95,23 +95,23 @@ if (isset ($_GET['exportpdf'])) {
 $actions = '<div class="actions">';
 
 if (isset($_GET['selectcat'])) {
-    $interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
-    $actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>';
+    $interbreadcrumb[] = array('url' => 'gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
+    $actions .= '<a href=gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'>'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
 if (isset ($_GET['selecteval'])) {
-    $interbreadcrumb[]= array (
-        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+    $interbreadcrumb[] = array(
+        'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']),
         'name' => get_lang('ViewResult'
     ));
-    $actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '>
-	'.Display::return_icon('back.png', get_lang('BackToEvaluation'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions .= '<a href=gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'>
+	'.Display::return_icon('back.png', get_lang('BackToEvaluation'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
-$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank">
-' . Display::return_icon('pdf.png', get_lang('ExportPDF'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions .= '<a href="'.api_get_self().'?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat='.$category[0]->get_id().'" target="_blank">
+' . Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
-$actions.='</div>';
+$actions .= '</div>';
 
 Display :: display_header(get_lang('ResultsPerUser'));
 echo $actions;
diff --git a/main/social/group_members.php b/main/social/group_members.php
index aa2df18ea5..d2c18377e2 100755
--- a/main/social/group_members.php
+++ b/main/social/group_members.php
@@ -117,7 +117,7 @@ $social_avatar_block = SocialManager::show_social_avatar_block(
     $group_id
 );
 $social_menu_block = SocialManager::show_social_menu('member_list', $group_id);
-$social_right_content = '<h2>' . $group_info['name'] . '</h2>';
+$social_right_content = '<h2>'.$group_info['name'].'</h2>';
 
 foreach ($users as $user) {
     switch ($user['relation_type']) {
@@ -136,24 +136,24 @@ foreach ($users as $user) {
                 )
             )
             ) {
-                $user['link'] = '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=delete">' .
+                $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete">'.
                     Display::return_icon(
                         'delete.png',
                         get_lang('DeleteFromGroup')
-                    ) . '</a>' .
-                    '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=set_moderator">' .
+                    ).'</a>'.
+                    '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=set_moderator">'.
                     Display::return_icon(
                         'social_moderator_add.png',
                         get_lang('AddModerator')
-                    ) . '</a>';
+                    ).'</a>';
             }
             break;
         case GROUP_USER_PERMISSION_PENDING_INVITATION:
-            $user['link'] = '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=add">' .
+            $user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=add">'.
                 Display::return_icon(
                     'pending_invitation.png',
                     get_lang('PendingInvitation')
-                ) . '</a>';
+                ).'</a>';
             break;
         case GROUP_USER_PERMISSION_MODERATOR:
             $user['link'] = Display::return_icon(
@@ -162,17 +162,17 @@ foreach ($users as $user) {
             );
             //only group admin can manage moderators
             if ($user_role == GROUP_USER_PERMISSION_ADMIN) {
-                $user['link'] .= '<a href="group_members.php?id=' . $group_id . '&u=' . $user['id'] . '&action=delete_moderator">'.
+                $user['link'] .= '<a href="group_members.php?id='.$group_id.'&u='.$user['id'].'&action=delete_moderator">'.
                     Display::return_icon(
                         'social_moderator_delete.png',
                         get_lang('DeleteModerator')
-                    ) . '</a>';
+                    ).'</a>';
             }
             break;
     }
 
     $userPicture = UserManager::getUserPicture($user['id']);
-    $user['image'] = '<img src="' . $userPicture . '"  width="50px" height="50px"  />';
+    $user['image'] = '<img src="'.$userPicture.'"  width="50px" height="50px"  />';
     $new_member_list[] = $user;
 }
 if (count($new_member_list) > 0) {
diff --git a/main/work/add_user.php b/main/work/add_user.php
index 0b22477999..127a13fbf3 100755
--- a/main/work/add_user.php
+++ b/main/work/add_user.php
@@ -72,8 +72,8 @@ if (!empty($items)) {
         $usersAdded[] = $myUserId;
         $userInfo = api_get_user_info($myUserId);
         $url = api_get_path(WEB_CODE_PATH).'work/add_user.php?action=delete&id='.$workId.'&user_id='.$myUserId;
-        $link = Display::url('<em class="fa fa-trash"></em> ' . get_lang('Delete'), $url, array('class' => 'btn btn-danger btn-sm'));
-        echo '<li class="list-group-item">' . $userInfo['complete_name_with_username'] . '<div class="pull-right">' . $link . '</div></li>';
+        $link = Display::url('<em class="fa fa-trash"></em> '.get_lang('Delete'), $url, array('class' => 'btn btn-danger btn-sm'));
+        echo '<li class="list-group-item">'.$userInfo['complete_name_with_username'].'<div class="pull-right">'.$link.'</div></li>';
     }
     echo '</ul>';
 }
@@ -106,8 +106,8 @@ if (!empty($userToAddList)) {
     foreach ($userToAddList as $user) {
         $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
         $url = api_get_path(WEB_CODE_PATH).'work/add_user.php?action=add&id='.$workId.'&user_id='.$user['user_id'];
-        $link = Display::url('<em class="fa fa-plus"></em> ' . get_lang('Add'), $url, array('class' => 'btn btn-primary btn-sm'));
-        echo '<li class="list-group-item">' . $userName . '<div class="pull-right"> ' . $link . '</div></li>';
+        $link = Display::url('<em class="fa fa-plus"></em> '.get_lang('Add'), $url, array('class' => 'btn btn-primary btn-sm'));
+        echo '<li class="list-group-item">'.$userName.'<div class="pull-right"> '.$link.'</div></li>';
     }
     echo '</ul>';
 } else {
diff --git a/main/work/edit_work.php b/main/work/edit_work.php
index ab849f60e6..cc00e5930b 100755
--- a/main/work/edit_work.php
+++ b/main/work/edit_work.php
@@ -28,7 +28,7 @@ if (api_is_platform_admin() == false && $locked == true) {
 
 $htmlHeadXtra[] = to_javascript_work();
 $interbreadcrumb[] = array(
-    'url' => api_get_path(WEB_CODE_PATH) . 'work/work.php?' . api_get_cidreq(),
+    'url' => api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq(),
     'name' => get_lang('StudentPublications')
 );
 $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
@@ -36,7 +36,7 @@ $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 $form = new FormValidator(
     'edit_dir',
     'post',
-    api_get_path(WEB_CODE_PATH) . 'work/edit_work.php?id=' . $workId . '&' . api_get_cidreq()
+    api_get_path(WEB_CODE_PATH).'work/edit_work.php?id='.$workId.'&'.api_get_cidreq()
 );
 $form->addElement('header', get_lang('Edit'));
 
diff --git a/plugin/add_shibboleth_login_button/index.php b/plugin/add_shibboleth_login_button/index.php
index 3c627b268d..3becec7feb 100755
--- a/plugin/add_shibboleth_login_button/index.php
+++ b/plugin/add_shibboleth_login_button/index.php
@@ -1,17 +1,17 @@
 <?php
 // Show the Shibboleth button to login using SHIBBOLETH
 
-$_template['show_message']   = false;
+$_template['show_message'] = false;
 
 if (api_is_anonymous()) {
-    $_template['show_message']   = true;
+    $_template['show_message'] = true;
     // the default title
     $button_label = "Connexion via Shibboleth";
     if (!empty($plugin_info['settings']['add_shibboleth_login_button_shibboleth_button_label'])) {
         $button_label = api_htmlentities($plugin_info['settings']['add_shibboleth_login_button_shibboleth_button_label']);
     }
     // the comm
-    $comm_label = api_htmlentities($plugin_info['settings']['add_shibboleth_login_button_shibboleth_button_comment']);;
+    $comm_label = api_htmlentities($plugin_info['settings']['add_shibboleth_login_button_shibboleth_button_comment']); ;
     // URL of the image
     $url_label = $plugin_info['settings']['add_shibboleth_login_button_shibboleth_image_url'];
     
diff --git a/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php b/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php
index 4ab5f36897..50f6d8796c 100644
--- a/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php
+++ b/plugin/advanced_subscription/ajax/advanced_subscription.ajax.php
@@ -8,7 +8,7 @@
 /**
  * Init
  */
-require_once __DIR__ . '/../config.php';
+require_once __DIR__.'/../config.php';
 
 $plugin = AdvancedSubscriptionPlugin::create();
 // Get validation hash
@@ -120,8 +120,7 @@ if ($verified) {
                 $isWesternNameOrder = api_is_western_name_order();
                 foreach ($adminsArray as &$admin) {
                     $admin['complete_name'] = $isWesternNameOrder ?
-                        $admin['firstname'] . ', ' . $admin['lastname'] :
-                        $admin['lastname'] . ', ' . $admin['firstname']
+                        $admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
                     ;
                 }
                 unset($admin);
@@ -140,8 +139,8 @@ if ($verified) {
                     $res = $plugin->updateQueueStatus($data, ADVANCED_SUBSCRIPTION_QUEUE_STATUS_BOSS_APPROVED);
                     if (!empty($res)) {
                         // Prepare admin url
-                        $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH) .
-                            'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
+                        $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH).
+                            'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
                         // Send mails
                         $result['mailIds'] = $plugin->sendMail(
                             $data,
@@ -276,8 +275,7 @@ if ($verified) {
                     $isWesternNameOrder = api_is_western_name_order();
                     foreach ($adminsArray as &$admin) {
                         $admin['complete_name'] = $isWesternNameOrder ?
-                            $admin['firstname'] . ', ' . $admin['lastname'] :
-                            $admin['lastname'] . ', ' . $admin['firstname']
+                            $admin['firstname'].', '.$admin['lastname'] : $admin['lastname'].', '.$admin['firstname']
                         ;
                     }
                     unset($admin);
@@ -288,7 +286,7 @@ if ($verified) {
                     $data['session'] = $sessionArray;
                     $data['signature'] = api_get_setting('Institution');
                     $data['admin_view_url'] = api_get_path(WEB_PLUGIN_PATH)
-                        . 'advanced_subscription/src/admin_view.php?s=' . $data['sessionId'];
+                        . 'advanced_subscription/src/admin_view.php?s='.$data['sessionId'];
                     // Check if exist and action in data
                     if (empty($data['mailAction'])) {
                         // set action in data by new status
diff --git a/plugin/advanced_subscription/src/HookAdvancedSubscription.php b/plugin/advanced_subscription/src/HookAdvancedSubscription.php
index de014c3d44..b8498260d2 100644
--- a/plugin/advanced_subscription/src/HookAdvancedSubscription.php
+++ b/plugin/advanced_subscription/src/HookAdvancedSubscription.php
@@ -6,7 +6,7 @@
  * @package chamilo.plugin.advanced_subscription
  */
 
-require_once __DIR__ . '/../config.php';
+require_once __DIR__.'/../config.php';
 
 /**
  * Class HookAdvancedSubscription extends the HookObserver to implements
@@ -420,7 +420,7 @@ class HookAdvancedSubscription extends HookObserver implements
 
         if ($debug) {
             error_log(__FUNCTION__);
-            error_log('Params ' . print_r($params, 1));
+            error_log('Params '.print_r($params, 1));
         }
         if (!WSHelperVerifyKey($params)) {
 
@@ -471,7 +471,7 @@ class HookAdvancedSubscription extends HookObserver implements
 
         if ($debug) {
             error_log('WSUserSubscribedInCourse');
-            error_log('Params ' . print_r($params, 1));
+            error_log('Params '.print_r($params, 1));
         }
         if (!WSHelperVerifyKey($params)) {
             return return_error(WS_ERROR_SECRET_KEY);
@@ -576,7 +576,7 @@ class HookAdvancedSubscription extends HookObserver implements
 
         if ($debug) {
             error_log('WSListSessionsDetailsByCategory');
-            error_log('Params ' . print_r($params, 1));
+            error_log('Params '.print_r($params, 1));
         }
         $secretKey = $params['secret_key'];
 
diff --git a/plugin/advanced_subscription/src/admin_view.php b/plugin/advanced_subscription/src/admin_view.php
index 99736534f9..d1c0105802 100644
--- a/plugin/advanced_subscription/src/admin_view.php
+++ b/plugin/advanced_subscription/src/admin_view.php
@@ -7,7 +7,7 @@
 /**
  * Init
  */
-require_once __DIR__ . '/../config.php';
+require_once __DIR__.'/../config.php';
 // protect
 api_protect_admin_script();
 // start plugin
@@ -85,8 +85,7 @@ if (!empty($sessionId)) {
         $data['newStatus'] = ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_DISAPPROVED;
         $student['rejectUrl'] = $plugin->getQueueUrl($data);
         $student['complete_name'] = $isWesternNameOrder ?
-            $student['firstname'] . ', ' . $student['lastname'] :
-            $student['lastname'] . ', ' . $student['firstname'];
+            $student['firstname'].', '.$student['lastname'] : $student['lastname'].', '.$student['firstname'];
     }
     $tpl->assign('session', $sessionArray);
     $tpl->assign('students', $studentList['students']);
diff --git a/plugin/advanced_subscription/src/open_session.php b/plugin/advanced_subscription/src/open_session.php
index 9452d48d2b..a64fb319ae 100644
--- a/plugin/advanced_subscription/src/open_session.php
+++ b/plugin/advanced_subscription/src/open_session.php
@@ -5,7 +5,7 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.plugin.advanced_subscription
  */
-require_once __DIR__ . '/../config.php';
+require_once __DIR__.'/../config.php';
 
 $plugin = AdvancedSubscriptionPlugin::create();
 
diff --git a/plugin/advanced_subscription/src/render_mail.php b/plugin/advanced_subscription/src/render_mail.php
index c0974d1700..044007fc2a 100644
--- a/plugin/advanced_subscription/src/render_mail.php
+++ b/plugin/advanced_subscription/src/render_mail.php
@@ -8,7 +8,7 @@
 /**
  * Init
  */
-require_once __DIR__ . '/../config.php';
+require_once __DIR__.'/../config.php';
 
 $plugin = AdvancedSubscriptionPlugin::create();
 // Get validation hash
diff --git a/plugin/advanced_subscription/src/scripts/insert_session_fields.php b/plugin/advanced_subscription/src/scripts/insert_session_fields.php
index 47bf8de61f..d2af6333d8 100644
--- a/plugin/advanced_subscription/src/scripts/insert_session_fields.php
+++ b/plugin/advanced_subscription/src/scripts/insert_session_fields.php
@@ -7,7 +7,7 @@
 
 //exit;
 
-require_once __DIR__ . '/../../config.php';
+require_once __DIR__.'/../../config.php';
 
 api_protect_admin_script();
 
diff --git a/plugin/advanced_subscription/src/scripts/insert_sessions_categories.php b/plugin/advanced_subscription/src/scripts/insert_sessions_categories.php
index 69a255ca4d..27eb9fbc0f 100644
--- a/plugin/advanced_subscription/src/scripts/insert_sessions_categories.php
+++ b/plugin/advanced_subscription/src/scripts/insert_sessions_categories.php
@@ -4,7 +4,7 @@
  * This script generates four session categories.
  * @package chamilo.plugin.advanced_subscription
  */
-require_once __DIR__ . '/../../config.php';
+require_once __DIR__.'/../../config.php';
 
 api_protect_admin_script();
 
diff --git a/plugin/before_login/index.php b/plugin/before_login/index.php
index 7a9e08d1e5..b925bcecb8 100755
--- a/plugin/before_login/index.php
+++ b/plugin/before_login/index.php
@@ -34,7 +34,7 @@ if (api_is_anonymous()) {
 
     $form = new FormValidator('form');
 
-    $renderer =& $form->defaultRenderer();
+    $renderer = & $form->defaultRenderer();
     $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
     $renderersetCustomElementTemplate->setCustomElementTemplate('<tr><td>{element}</td></tr>');
 
@@ -54,7 +54,7 @@ if (api_is_anonymous()) {
     $form2 = new FormValidator('form');
 
     if (!empty($option2) && !empty($urlOption2)) {
-        $renderer =& $form2->defaultRenderer();
+        $renderer = & $form2->defaultRenderer();
         $renderer->setHeaderTemplate('');
         $renderer->setFormTemplate('<form{attributes}><table border="0" cellpadding="5" cellspacing="0" width="100%">{content}</table></form>');
         $renderer->setCustomElementTemplate('<tr><td>{element}</td></tr>');
diff --git a/plugin/before_login/plugin.php b/plugin/before_login/plugin.php
index 290584e74e..77540f7000 100755
--- a/plugin/before_login/plugin.php
+++ b/plugin/before_login/plugin.php
@@ -41,9 +41,9 @@ $defaults['option2'] = api_get_plugin_setting('before_login', 'option2');
 $defaults['option1_url'] = api_get_plugin_setting('before_login', 'option1_url');
 $defaults['option2_url'] = api_get_plugin_setting('before_login', 'option2_url');
 
-$plugin_info['templates']   = array('template.tpl');
+$plugin_info['templates'] = array('template.tpl');
 if (file_exists(__DIR__.'/custom.template.tpl')) {
-    $plugin_info['templates']   = array( 'custom.template.tpl');
+    $plugin_info['templates'] = array('custom.template.tpl');
 }
 $form->setDefaults($defaults);
 
diff --git a/plugin/buycourses/config.php b/plugin/buycourses/config.php
index bd15ebb6bb..3c28b727e3 100644
--- a/plugin/buycourses/config.php
+++ b/plugin/buycourses/config.php
@@ -1,4 +1,4 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once __DIR__ . '/../../main/inc/global.inc.php';
+require_once __DIR__.'/../../main/inc/global.inc.php';
diff --git a/plugin/buycourses/src/expresscheckout.php b/plugin/buycourses/src/expresscheckout.php
index 2e033e2e15..b1feeb0e2c 100644
--- a/plugin/buycourses/src/expresscheckout.php
+++ b/plugin/buycourses/src/expresscheckout.php
@@ -40,8 +40,8 @@ if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING") {
     $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
 
     echo "SetExpressCheckout API call failed. ";
-    echo "Detailed Error Message: " . $ErrorLongMsg;
-    echo "Short Error Message: " . $ErrorShortMsg;
-    echo "Error Code: " . $ErrorCode;
-    echo "Error Severity Code: " . $ErrorSeverityCode;
+    echo "Detailed Error Message: ".$ErrorLongMsg;
+    echo "Short Error Message: ".$ErrorShortMsg;
+    echo "Error Code: ".$ErrorCode;
+    echo "Error Severity Code: ".$ErrorSeverityCode;
 }
diff --git a/plugin/buycourses/src/success.php b/plugin/buycourses/src/success.php
index 3b276312f4..df6f958784 100644
--- a/plugin/buycourses/src/success.php
+++ b/plugin/buycourses/src/success.php
@@ -56,7 +56,7 @@ if ($form->validate()) {
 
         unset($_SESSION['bc_sale_id']);
 
-        header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/index.php');
+        header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/index.php');
         exit;
     }
 
@@ -165,7 +165,7 @@ if ($form->validate()) {
     }
 
     unset($_SESSION['bc_sale_id']);
-    header('Location: ' . api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/course_catalog.php');
+    header('Location: '.api_get_path(WEB_PLUGIN_PATH).'buycourses/src/course_catalog.php');
     exit;
 }
 
diff --git a/plugin/buycourses/uninstall.php b/plugin/buycourses/uninstall.php
index faea760796..80cba114ff 100644
--- a/plugin/buycourses/uninstall.php
+++ b/plugin/buycourses/uninstall.php
@@ -10,5 +10,5 @@
 /**
  * Queries
  */
-require_once dirname(__FILE__) . '/config.php';
+require_once dirname(__FILE__).'/config.php';
 BuyCoursesPlugin::create()->uninstall();
diff --git a/plugin/courselegal/CourseLegalPlugin.php b/plugin/courselegal/CourseLegalPlugin.php
index 753e19e43b..38c22adaed 100755
--- a/plugin/courselegal/CourseLegalPlugin.php
+++ b/plugin/courselegal/CourseLegalPlugin.php
@@ -421,7 +421,7 @@ class CourseLegalPlugin extends Plugin
                 array('id = ? ' => $id)
             );
             if (!empty($legalData['filename'])) {
-                $fileToDelete = $coursePath . '/' . $legalData['filename'];
+                $fileToDelete = $coursePath.'/'.$legalData['filename'];
                 if (file_exists($fileToDelete)) {
                     unlink($fileToDelete);
                 }
diff --git a/plugin/courselegal/install.php b/plugin/courselegal/install.php
index d8a4aaefca..06af66af61 100755
--- a/plugin/courselegal/install.php
+++ b/plugin/courselegal/install.php
@@ -1,7 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 
-require_once dirname(__FILE__) . '/config.php';
+require_once dirname(__FILE__).'/config.php';
 
 if (!api_is_platform_admin()) {
     die ('You must have admin permissions to install plugins');
diff --git a/plugin/courselegal/start.php b/plugin/courselegal/start.php
index 1e80412c25..5c4f2405e1 100755
--- a/plugin/courselegal/start.php
+++ b/plugin/courselegal/start.php
@@ -1,7 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 
-require_once dirname(__FILE__) . '/config.php';
+require_once dirname(__FILE__).'/config.php';
 
 // Course legal
 $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
diff --git a/plugin/courselegal/user_list.php b/plugin/courselegal/user_list.php
index 8a5c8786c0..c960980765 100755
--- a/plugin/courselegal/user_list.php
+++ b/plugin/courselegal/user_list.php
@@ -1,6 +1,6 @@
 <?php
 /* For license terms, see /license.txt */
-require_once dirname(__FILE__) . '/config.php';
+require_once dirname(__FILE__).'/config.php';
 
 // Course legal
 $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
@@ -19,7 +19,7 @@ $sessionId = api_get_session_id();
 $url = api_get_self().'?'.api_get_cidreq();
 
 $action = isset($_GET['action']) ? $_GET['action'] : null;
-switch($action) {
+switch ($action) {
     case 'resend':
         if (isset($_GET['user_id'])) {
             $legal->updateMailAgreementLink($_GET['user_id'], $courseId, $sessionId);
diff --git a/plugin/createdrupaluser/index.php b/plugin/createdrupaluser/index.php
index 206504389d..10767bc0fb 100644
--- a/plugin/createdrupaluser/index.php
+++ b/plugin/createdrupaluser/index.php
@@ -5,4 +5,4 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.plugin.createDrupalUser
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
diff --git a/plugin/createdrupaluser/install.php b/plugin/createdrupaluser/install.php
index 8e053a7e0c..4f4f5c5e3d 100644
--- a/plugin/createdrupaluser/install.php
+++ b/plugin/createdrupaluser/install.php
@@ -5,6 +5,6 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.plugin.createDrupalUser
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
 
 CreateDrupalUser::create()->install();
diff --git a/plugin/createdrupaluser/src/HookCreateDrupalUser.php b/plugin/createdrupaluser/src/HookCreateDrupalUser.php
index e46cec3de9..a0990024be 100644
--- a/plugin/createdrupaluser/src/HookCreateDrupalUser.php
+++ b/plugin/createdrupaluser/src/HookCreateDrupalUser.php
@@ -29,7 +29,7 @@ class HookCreateDrupalUser extends HookObserver implements HookCreateUserObserve
         $data = $hook->getEventData();
 
         $drupalDomain = CreateDrupalUser::create()->get('drupal_domain');
-        $drupalDomain = rtrim($drupalDomain, '/') . '/';
+        $drupalDomain = rtrim($drupalDomain, '/').'/';
 
         if ($data['type'] === HOOK_EVENT_TYPE_POST) {
             $return = $data['return'];
@@ -50,7 +50,7 @@ class HookCreateDrupalUser extends HookObserver implements HookCreateUserObserve
             );
 
             $options = array(
-                'location' => $drupalDomain . 'sites/all/modules/chamilo/soap.php?wsdl',
+                'location' => $drupalDomain.'sites/all/modules/chamilo/soap.php?wsdl',
                 'uri' => $drupalDomain
             );
 
diff --git a/plugin/createdrupaluser/uninstall.php b/plugin/createdrupaluser/uninstall.php
index fac2ff6868..8bdb6bad4d 100644
--- a/plugin/createdrupaluser/uninstall.php
+++ b/plugin/createdrupaluser/uninstall.php
@@ -5,6 +5,6 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.plugin.createDrupalUser
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
 
 CreateDrupalUser::create()->uninstall();
diff --git a/plugin/dashboard/block_student/block_student.class.php b/plugin/dashboard/block_student/block_student.class.php
index dc61f38c36..c1f758ec4b 100755
--- a/plugin/dashboard/block_student/block_student.class.php
+++ b/plugin/dashboard/block_student/block_student.class.php
@@ -21,12 +21,12 @@ class BlockStudent extends Block
 	/**
 	 * Constructor
 	 */
-    public function __construct ($user_id)
+    public function __construct($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_student';
+    	$this->user_id = $user_id;
+    	$this->path = 'block_student';
     	if ($this->is_block_visible_for_user($user_id)) {
-            $this->students =  UserManager::get_users_followed_by_drh($user_id, STUDENT);
+            $this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
     	}
     }
 
@@ -61,7 +61,7 @@ class BlockStudent extends Block
 		$html = '<div class="panel panel-default" id="intro">
                     <div class="panel-heading">
                         '.get_lang('StudentsInformationsList').'
-                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
+                        <div class="pull-right"><a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
                             <em class="fa fa-times"></em>
                         </a>
                         </div>
@@ -102,9 +102,9 @@ class BlockStudent extends Block
 
 	 			$courses_by_user = CourseManager::get_courses_list_by_user_id($student['user_id'], true);
 	 			$count_courses = count($courses_by_user);
-				$rowspan = $count_courses?$count_courses+1:2;
+				$rowspan = $count_courses ? $count_courses + 1 : 2;
 
-				if ($i%2 == 0) {
+				if ($i % 2 == 0) {
                     $style = ' style="background-color:#F2F2F2" ';
                 } else {
                     $style = ' style="background-color:#FFF" ';
@@ -169,7 +169,7 @@ class BlockStudent extends Block
 	 			$student_id = $student['user_id'];
 	 			$firstname  = $student['firstname'];
 	 			$lastname   = $student['lastname'];
-	 			$username	= $student['username'];
+	 			$username = $student['username'];
 
 
 				// get average of faults in attendances by student
@@ -188,7 +188,7 @@ class BlockStudent extends Block
 	 				$cats = Category::load(null, null, $course_code, null, null, null, false);
 	 				$scoretotal = array();
 	 				if (isset($cats) && isset($cats[0])) {
-		 				$scoretotal= $cats[0]->calc_score($student_id, null, $course_code);
+		 				$scoretotal = $cats[0]->calc_score($student_id, null, $course_code);
 	 				}
 
 	 				if (!empty($scoretotal)) {
@@ -198,10 +198,10 @@ class BlockStudent extends Block
 	 			}
 
 	 			if (!empty($weight)) {
-	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score,2).'/'.round($weight,2).'('.round(($score / $weight) * 100,2) . ' %)</a>';
+	 				$evaluations_avg = '<a title="'.get_lang('GoToStudentDetails').'" href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$student_id.'">'.round($score, 2).'/'.round($weight, 2).'('.round(($score / $weight) * 100, 2).' %)</a>';
 	 			}
 
-	 			if ($i%2 == 0) {
+	 			if ($i % 2 == 0) {
                     $class_tr = 'row_odd';
                 } else {
                     $class_tr = 'row_even';
diff --git a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
index 7bc32a78f8..9e279c1b8b 100755
--- a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
+++ b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
@@ -29,10 +29,10 @@ class BlockTeacherGraph extends Block
 	/**
 	 * Controller
 	 */
-    public function __construct ($user_id)
+    public function __construct($user_id)
     {
-    	$this->user_id  = $user_id;
-    	$this->path 	= 'block_teacher_graph';
+    	$this->user_id = $user_id;
+    	$this->path = 'block_teacher_graph';
     	if ($this->is_block_visible_for_user($user_id)) {
             $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
     	}
@@ -68,7 +68,7 @@ class BlockTeacherGraph extends Block
 		$html = '
                 <div class="panel panel-default" id="intro">
                     <div class="panel-heading">'.get_lang('TeachersInformationsGraph').'
-                        <div class="pull-right"><a class="btn btn-danger btn-xs"  onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
+                        <div class="pull-right"><a class="btn btn-danger btn-xs"  onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
                         <em class="fa fa-times"></em>
                         </a></div>
                     </div>
@@ -107,7 +107,7 @@ class BlockTeacherGraph extends Block
 				foreach ($a_last_week as $day) {
 					// day is received as y-m-d 12:00:00
 					$start_date = api_get_utc_datetime($day);
-					$end_date = api_get_utc_datetime($day+(3600*24-1));
+					$end_date = api_get_utc_datetime($day + (3600 * 24 - 1));
 
 					$time_on_platform_by_day = Tracking::get_time_spent_on_the_platform($user_id, 'custom', $start_date, $end_date);
 					$hours = floor($time_on_platform_by_day / 3600);
@@ -117,26 +117,26 @@ class BlockTeacherGraph extends Block
 				$dataSet->addPoints($time_by_days, $username);
 			}
 
-			$last_week 	 = date('Y-m-d',$a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
+			$last_week = date('Y-m-d', $a_last_week[0]).' '.get_lang('To').' '.date('Y-m-d', $a_last_week[6]);
 			$days_on_week = array();
 			foreach ($a_last_week as $weekday) {
-				$days_on_week[] = date('d/m',$weekday);
+				$days_on_week[] = date('d/m', $weekday);
 			}
 
 			$dataSet->addPoints($days_on_week, 'Days');
 			$dataSet->setAbscissaName($last_week);
 			$dataSet->setAxisName(0, get_lang('Minutes'));
             $dataSet->setAbscissa('Days');
-            $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+            $dataSet->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 
             // Cache definition
             $cachePath = api_get_path(SYS_ARCHIVE_PATH);
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
             $chartHash = $myCache->getHash($dataSet);
             if ($myCache->isInCache($chartHash)) {
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             } else {
 
                 /* Create the pChart object */
@@ -153,7 +153,7 @@ class BlockTeacherGraph extends Block
                 $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
 
                 /* Set the default font */
-                $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
+                $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
 
                 /* Do NOT Write the chart title */
 
@@ -189,11 +189,11 @@ class BlockTeacherGraph extends Block
 
                 /* Write and save into cache */
                 $myCache->writeToCache($chartHash, $myPicture);
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             }
-            $graph = '<img src="' . $imgPath . '" >';
+            $graph = '<img src="'.$imgPath.'" >';
 		} else {
 			$graph = '<p>'.api_convert_encoding(get_lang('GraphicNotAvailable'), 'UTF-8').'</p>';
 		}
diff --git a/plugin/show_user_info/lang/spanish.php b/plugin/show_user_info/lang/spanish.php
index 9db9500a20..80afaf57b0 100755
--- a/plugin/show_user_info/lang/spanish.php
+++ b/plugin/show_user_info/lang/spanish.php
@@ -1,3 +1,3 @@
 <?php
 
-$strings['WelcomeToChamiloUserX']     = "Bienvenido a Chamilo %s!";
\ No newline at end of file
+$strings['WelcomeToChamiloUserX'] = "Bienvenido a Chamilo %s!";
\ No newline at end of file
diff --git a/plugin/tour/ajax/save.ajax.php b/plugin/tour/ajax/save.ajax.php
index fcee058159..40c7260b0f 100644
--- a/plugin/tour/ajax/save.ajax.php
+++ b/plugin/tour/ajax/save.ajax.php
@@ -8,8 +8,8 @@
 /**
  * Init
  */
-require_once __DIR__ . '/../../../main/inc/global.inc.php';
-require_once __DIR__ . '/../config.php';
+require_once __DIR__.'/../../../main/inc/global.inc.php';
+require_once __DIR__.'/../config.php';
 
 if (!api_is_anonymous()) {
     $currentPageClass = isset($_POST['page_class']) ? $_POST['page_class'] : '';
diff --git a/plugin/tour/install.php b/plugin/tour/install.php
index 31ef15b6da..bb26e62519 100644
--- a/plugin/tour/install.php
+++ b/plugin/tour/install.php
@@ -5,6 +5,6 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.plugin.tour
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
 
 Tour::create()->install();
diff --git a/plugin/tour/uninstall.php b/plugin/tour/uninstall.php
index 0806c2cf6a..ee4a551b88 100644
--- a/plugin/tour/uninstall.php
+++ b/plugin/tour/uninstall.php
@@ -5,6 +5,6 @@
  * @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com>
  * @package chamilo.plugin.tour
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
 
 Tour::create()->uninstall();
diff --git a/src/Chamilo/CoreBundle/Component/Editor/Driver/HomeDriver.php b/src/Chamilo/CoreBundle/Component/Editor/Driver/HomeDriver.php
index 4f6cbe160f..4dccd27615 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/Driver/HomeDriver.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/Driver/HomeDriver.php
@@ -31,7 +31,7 @@ class HomeDriver extends Driver implements DriverInterface
                 'driver' => 'HomeDriver',
                 'alias' => get_lang('Portal'),
                 'path' => $home,
-                'URL' => api_get_path(WEB_PATH) . 'home',
+                'URL' => api_get_path(WEB_PATH).'home',
                 'accessControl' => array($this, 'access'),
             );
         }
diff --git a/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php b/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php
index a865377993..4a974816b4 100644
--- a/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php
+++ b/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php
@@ -48,7 +48,7 @@ class SequenceRepository extends EntityRepository
             foreach ($from as $subVertex) {
                 $vertexId = $subVertex->getId();
                 $sessionInfo = api_get_session_info($vertexId);
-                $sessionInfo['admin_link'] = '<a href="' . \SessionManager::getAdminPath($vertexId) . '">' . $sessionInfo['name'] . '</a>';
+                $sessionInfo['admin_link'] = '<a href="'.\SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
                 $result['requirements'][] = $sessionInfo;
             }
 
@@ -56,7 +56,7 @@ class SequenceRepository extends EntityRepository
             foreach ($to as $subVertex) {
                 $vertexId = $subVertex->getId();
                 $sessionInfo = api_get_session_info($vertexId);
-                $sessionInfo['admin_link'] = '<a href="' . \SessionManager::getAdminPath($vertexId) . '">' . $sessionInfo['name'] . '</a>';
+                $sessionInfo['admin_link'] = '<a href="'.\SessionManager::getAdminPath($vertexId).'">'.$sessionInfo['name'].'</a>';
                 $result['dependencies'][] = $sessionInfo;
             }
         }