diff --git a/main/coursecopy/copy_course.php b/main/coursecopy/copy_course.php
index 3ca1e390da..bf48fee77f 100755
--- a/main/coursecopy/copy_course.php
+++ b/main/coursecopy/copy_course.php
@@ -130,7 +130,6 @@ if (Security::check_token('post') && (
         $token = Security::get_token();
         $form->addElement('hidden', 'sec_token');
         $form->setConstants(array('sec_token' => $token));
-
         $form->display();
     }
 }
diff --git a/main/coursecopy/copy_course_session.php b/main/coursecopy/copy_course_session.php
index 026b83a3da..2b286eb945 100755
--- a/main/coursecopy/copy_course_session.php
+++ b/main/coursecopy/copy_course_session.php
@@ -88,8 +88,6 @@ function display_form()
     $html  = '';
     $sessions = SessionManager::get_sessions_list(array(), array('name', 'ASC'));
 
-    // Actions
-
     // Link back to the documents overview
     $actionsLeft = '<a href="../admin/index.php">'.
         Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).
@@ -165,7 +163,6 @@ function search_courses($id_session, $type)
 
             // Build select for destination sessions where is not included current session from select origin
             if (!empty($id_session)) {
-
                 $sessions = SessionManager::get_sessions_list(array(), array('name', 'ASC'));
 
                 $select_destination .= '<select name="sessions_list_destination" class="form-control" onchange = "javascript: xajax_search_courses(this.value,\'destination\');">';
@@ -231,7 +228,7 @@ $xajax->processRequests();
 /* HTML head extra */
 
 $htmlHeadXtra[] = $xajax->getJavascript( api_get_path(WEB_LIBRARY_PATH).'xajax/');
-$htmlHeadXtra[] = '<script type="text/javascript">
+$htmlHeadXtra[] = '<script>
 function checkSelected(id_select,id_radio,id_title,id_destination) {
    var num=0;
    obj_origin = document.getElementById(id_select);
@@ -282,10 +279,10 @@ if (Security::check_token('post') && (
     Security::clear_token();
     $destination_course = $origin_course = $destination_session = $origin_session = '';
     if (isset ($_POST['action']) && $_POST['action'] == 'course_select_form') {
-        $destination_course	 	= $_POST['destination_course'];
-        $origin_course 			= $_POST['origin_course'];
-        $destination_session 	= $_POST['destination_session'];
-        $origin_session 		= $_POST['origin_session'];
+        $destination_course = $_POST['destination_course'];
+        $origin_course = $_POST['origin_course'];
+        $destination_session = $_POST['destination_session'];
+        $origin_session = $_POST['origin_session'];
 
         $course = CourseSelectForm::get_posted_course(
             'copy_course',
@@ -299,23 +296,22 @@ if (Security::check_token('post') && (
         Display::display_confirmation_message(get_lang('CopyFinished'));
         display_form();
     } else {
-
-        $arr_course_origin 		= array();
+        $arr_course_origin = array();
         $arr_course_destination = array();
-        $destination_session 	= '';
-        $origin_session 		= '';
+        $destination_session = '';
+        $origin_session = '';
 
         if (isset($_POST['SessionCoursesListOrigin'])) {
-            $arr_course_origin 		= $_POST['SessionCoursesListOrigin'];
+            $arr_course_origin = $_POST['SessionCoursesListOrigin'];
         }
         if (isset($_POST['SessionCoursesListDestination'])) {
             $arr_course_destination = $_POST['SessionCoursesListDestination'];
         }
         if (isset($_POST['sessions_list_destination'])) {
-            $destination_session 	= $_POST['sessions_list_destination'];
+            $destination_session = $_POST['sessions_list_destination'];
         }
         if (isset($_POST['sessions_list_origin'])) {
-            $origin_session 		= $_POST['sessions_list_origin'];
+            $origin_session = $_POST['sessions_list_origin'];
         }
 
         if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
@@ -323,7 +319,6 @@ if (Security::check_token('post') && (
             if (count($arr_course_origin) > 1 || count($arr_course_destination) > 1) {
                 Display::display_error_message(get_lang('YouMustSelectACourseFromOriginalSession'));
             } else {
-                //foreach ($arr_course_origin as $course_origin) {
                 //first element of the array
                 $course_code = $arr_course_origin[0];
                 $course_destinatination = $arr_course_destination[0];
@@ -355,22 +350,22 @@ if (Security::check_token('post') && (
         Display::display_normal_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
     }
 
-    $arr_course_origin 		= array();
+    $arr_course_origin = array();
     $arr_course_destination = array();
-    $destination_session 	= '';
-    $origin_session 		= '';
+    $destination_session = '';
+    $origin_session = '';
 
     if (isset($_POST['SessionCoursesListOrigin'])) {
-        $arr_course_origin 		= $_POST['SessionCoursesListOrigin'];
+        $arr_course_origin = $_POST['SessionCoursesListOrigin'];
     }
     if (isset($_POST['SessionCoursesListDestination'])) {
         $arr_course_destination = $_POST['SessionCoursesListDestination'];
     }
     if (isset($_POST['sessions_list_destination'])) {
-        $destination_session 	= $_POST['sessions_list_destination'];
+        $destination_session = $_POST['sessions_list_destination'];
     }
     if (isset($_POST['sessions_list_origin'])) {
-        $origin_session 		= $_POST['sessions_list_origin'];
+        $origin_session = $_POST['sessions_list_origin'];
     }
 
     if ((is_array($arr_course_origin) && count($arr_course_origin) > 0) && !empty($destination_session)) {
@@ -378,14 +373,12 @@ if (Security::check_token('post') && (
         $course_origin = api_get_course_info($arr_course_origin[0]);
         $cb = new CourseBuilder('', $course_origin);
         $course = $cb->build($origin_session, $arr_course_origin[0], $with_base_content);
-        //$hiddenFields['same_file_name_option'] = $_POST['same_file_name_option'];
-        $hiddenFields['destination_course'] 	= $arr_course_destination[0];
-        $hiddenFields['origin_course'] 		= $arr_course_origin[0];
-        $hiddenFields['destination_session'] 	= $destination_session;
-        $hiddenFields['origin_session'] 		= $origin_session;
+        $hiddenFields['destination_course'] = $arr_course_destination[0];
+        $hiddenFields['origin_course'] = $arr_course_origin[0];
+        $hiddenFields['destination_session'] = $destination_session;
+        $hiddenFields['origin_session'] = $origin_session;
         // Add token to Course select form
         $hiddenFields['sec_token'] = Security::get_token();
-
         CourseSelectForm :: display_form($course, $hiddenFields, true);
         echo '<div style="float:right"><a href="javascript:window.history.go(-1);">'.
             Display::return_icon(
diff --git a/main/coursecopy/copy_course_session_selected.php b/main/coursecopy/copy_course_session_selected.php
index acce4e2ad2..a3018996a6 100644
--- a/main/coursecopy/copy_course_session_selected.php
+++ b/main/coursecopy/copy_course_session_selected.php
@@ -55,7 +55,7 @@ $interbreadcrumb[] = array(
 
 // Database Table Definitions
 $tbl_session_rel_course_rel_user = Database::get_main_table(
-        TABLE_MAIN_SESSION_COURSE_USER
+    TABLE_MAIN_SESSION_COURSE_USER
 );
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
diff --git a/main/coursecopy/import_moodle.php b/main/coursecopy/import_moodle.php
index 6400df9fa3..497e83fa90 100644
--- a/main/coursecopy/import_moodle.php
+++ b/main/coursecopy/import_moodle.php
@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use ChamiloSession as Session;
-
 /**
  * Import a backup from moodle system.
  *
diff --git a/main/coursecopy/recycle_course.php b/main/coursecopy/recycle_course.php
index 314d121781..a2dda2d07f 100755
--- a/main/coursecopy/recycle_course.php
+++ b/main/coursecopy/recycle_course.php
@@ -55,7 +55,7 @@ if (Security::check_token('post') && (
         $cb = new CourseBuilder();
         $course = $cb->build();
     }
-    $recycle_type = "";
+    $recycle_type = '';
     if (isset($_POST['recycle_option']) && $_POST['recycle_option'] == 'full_backup') {
         $recycle_type = 'full_backup';
     } else if (isset($_POST['action']) && $_POST['action'] == 'course_select_form') {
@@ -96,7 +96,6 @@ if (Security::check_token('post') && (
         $token = Security::get_token();
         $form->addElement('hidden', 'sec_token');
         $form->setConstants(array('sec_token' => $token));
-
         $form->display();
     }
 }
diff --git a/main/create_course/add_course.php b/main/create_course/add_course.php
index 2bd46ec20d..cbe0be3c8e 100755
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
@@ -116,7 +116,6 @@ $form->addRule(
 // The teacher
 $titular = & $form->addElement('hidden', 'tutor_name', '');
 if ($course_validation_feature) {
-
     // Description of the requested course.
     $form->addElement(
         'textarea',
@@ -279,7 +278,6 @@ if ($form->validate()) {
 
     if ($course_code_ok) {
         if (!$course_validation_feature) {
-
             $params = array();
             $params['title'] = $title;
             $params['exemplary_content'] = $exemplary_content;
@@ -320,7 +318,6 @@ if ($form->validate()) {
                     header('Location: ' . $url);
                     exit;
                 } else {
-
                     $url = api_get_path(WEB_COURSE_PATH) . $course_info['directory'] . '/';
                     header('Location: ' . $url);
                     exit;
diff --git a/main/dashboard/dashboard.php b/main/dashboard/dashboard.php
index 6c7012827a..606499285e 100755
--- a/main/dashboard/dashboard.php
+++ b/main/dashboard/dashboard.php
@@ -56,7 +56,7 @@ if (isset($dashboard_view) && $dashboard_view == 'blocks') {
         if (count($columns) > 0) {
             $columns_name = array_keys($columns);
             // blocks for column 1
-            if (in_array('column_1',$columns_name)) {
+            if (in_array('column_1', $columns_name)) {
                 echo '<div id="column1" class="col-md-6">';
                     foreach ($columns['column_1'] as $content) {
                         echo $content;
@@ -68,7 +68,7 @@ if (isset($dashboard_view) && $dashboard_view == 'blocks') {
                 echo '</div>';
             }
             // blocks for column 2
-            if (in_array('column_2',$columns_name)) {
+            if (in_array('column_2', $columns_name)) {
                 // blocks for column 1
                 echo '<div id="column2" class="col-md-6">';
                     foreach ($columns['column_2'] as $content) {
diff --git a/main/dashboard/dashboard_controller.php b/main/dashboard/dashboard_controller.php
index e371a86a87..85aedc8b2b 100755
--- a/main/dashboard/dashboard_controller.php
+++ b/main/dashboard/dashboard_controller.php
@@ -29,7 +29,7 @@ class DashboardController
 
     /**
      * Display blocks from dashboard plugin paths
-     * @param string message (optional)
+     * @param string $msg (optional)
      * render to dashboard.php view
      */
     public function display($msg = false)
@@ -46,9 +46,10 @@ class DashboardController
 
         if (!empty($dashboard_blocks)) {
             foreach ($dashboard_blocks as $block) {
-
                 // display only user blocks
-                if (!in_array($block['id'], $user_blocks_id)) continue;
+                if (!in_array($block['id'], $user_blocks_id)) {
+                    continue;
+                }
 
                 $path = $block['path'];
                 $controller_class = $block['controller'];
@@ -61,7 +62,9 @@ class DashboardController
                     // check if user is allowed to see the block
                     if (method_exists($obj, 'is_block_visible_for_user')) {
                         $is_block_visible_for_user = $obj->is_block_visible_for_user($user_id);
-                        if (!$is_block_visible_for_user) continue;
+                        if (!$is_block_visible_for_user) {
+                            continue;
+                        }
                     }
 
                     $data_block[$path] = $obj->get_block();
diff --git a/src/Chamilo/UserBundle/Entity/Repository/UserRepository.php b/src/Chamilo/UserBundle/Entity/Repository/UserRepository.php
index 22bc1e3476..9540102b6f 100644
--- a/src/Chamilo/UserBundle/Entity/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Entity/Repository/UserRepository.php
@@ -7,6 +7,7 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\UserBundle\Entity\User;
 use Doctrine\ORM\Query\Expr\Join;
 use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 
@@ -175,7 +176,7 @@ class UserRepository extends EntityRepository
 
     /**
      * Get the sessions admins for a user
-     * @param \Chamilo\UserBundle\Entity\User $user The user
+     * @param User $user The user
      * @return array
      */
     public function getSessionAdmins($user)