Minor - flint fixes

main/admin/course_list.php

@@ -6,7 +6,6 @@
  * This script shows a list of courses and allows searching for courses codes
  * and names.
  */
-
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;

main/admin/resource_sequence.php

@@ -133,7 +133,7 @@ $headers[] = [
     'content' => get_lang('Courses'),
 ];
 
-$tabs = Display::tabsOnlyLink($headers,$type === SequenceResource::COURSE_TYPE ? 2 : 1);
+$tabs = Display::tabsOnlyLink($headers, $type === SequenceResource::COURSE_TYPE ? 2 : 1);
 
 $tpl->assign('create_sequence', $formSequence->returnForm());
 $tpl->assign('select_sequence', $selectSequence->returnForm());

main/admin/settings.lib.php

@@ -118,9 +118,11 @@ function handleExtensions()
 }
 
 /**
- * Show form for plugin and validates inputs. Calls uploadPlugin() if everything OK
+ * Show form for plugin and validates inputs. Calls uploadPlugin() if everything OK.
- * @return string|void The HTML form, or displays a message and returns nothing on error
+ *
  * @throws Exception
+ *
+ * @return string|void The HTML form, or displays a message and returns nothing on error
  */
 function handlePluginUpload()
 {
@@ -131,6 +133,7 @@ function handlePluginUpload()
             'error',
             false
         );
+
         return;
     }
     $pluginPath = api_get_path(SYS_PLUGIN_PATH);
@@ -140,6 +143,7 @@ function handlePluginUpload()
             'error',
             false
         );
+
         return;
     }
 
@@ -742,8 +746,8 @@ function uploadStylesheet($values, $picture)
  * Creates the folder (if needed) and uploads the plugin in it. If the plugin
  * is already there and the folder is writeable, overwrite.
  *
- * @param array $values  the values of the form
+ * @param array $values          the values of the form
- * @param array $file   the file passed to the upload form
+ * @param array $file            the file passed to the upload form
  * @param array $officialPlugins A list of official plugins that cannot be uploaded
  *
  * @return bool

main/admin/user_information.php

@@ -10,7 +10,6 @@ use Chamilo\UserBundle\Entity\User;
  *
  * @author Bart Mollet
  */
-
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;

main/admin/user_list.php

@@ -356,7 +356,7 @@ function prepare_user_sql_query($getCount)
                 $_GET['extra_'.$variable] = Security::remove_XSS($_GET['keyword']);
             }
         }
-        $variables = array_merge( $extraFieldList, $variables);
+        $variables = array_merge($extraFieldList, $variables);
     }
 
     if (!empty($variables)) {

main/admin/user_move_stats.php

@@ -270,7 +270,7 @@ if (isset($_REQUEST['load_ajax'])) {
                 while ($row = Database::fetch_array($res, 'ASSOC')) {
                     // Checking if the LP exist in the new session
                     //if (in_array($row['lp_id'], array_keys($flat_list))) {
-                        $list[$row['id']] = $row;
+                    $list[$row['id']] = $row;
                     //}
                 }
 
@@ -323,7 +323,7 @@ if (isset($_REQUEST['load_ajax'])) {
                     while ($row = Database::fetch_array($res, 'ASSOC')) {
                         //Checking if the LP exist in the new session
                         //if (in_array($row['lp_id'], array_keys($flat_list))) {
-                            $list[$row['id']] = $row;
+                        $list[$row['id']] = $row;
                         //}
                     }
 

main/auth/courses_controller.php

@@ -361,7 +361,7 @@ class CoursesController
     /**
      * Return Session catalog rendered view.
      *
-     * @param array  $limit
+     * @param array $limit
      */
     public function sessionList($limit = [])
     {

main/auth/okn/start.php

@@ -165,15 +165,12 @@ if (isset($_GET['email'])) {
         }
         header('Location: '.api_get_path(WEB_PATH).'user_portal.php');
         exit;
-        /*$result = Tracking::getCourseLpProgress($userId, 0);
-        echo json_encode($result);*/
     } else {
         echo 'User not found';
     }
     exit;
 
     if (!empty($userId)) {
-
     } else {
         Display::addFlash(Display::return_message(get_lang('InvalidId')));
     }

main/course_home/course_home.php

@@ -155,19 +155,19 @@ if ($action == 'subscribe') {
             if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
                 // append session id to redirect URL
                 /**
-                 * @var $user Chamilo\UserBundle\Entity\User
+                 * @var Chamilo\UserBundle\Entity\User
                  */
                 $user = UserManager::getRepository()->find(api_get_user_id());
                 if ($user) {
                     foreach ($user->getCurrentlyAccessibleSessions() as $session) {
-                        $redirectionTarget = api_get_self() . '?id_session=' . $session->getId();
+                        $redirectionTarget = api_get_self().'?id_session='.$session->getId();
                         break;
                     }
                 }
             }
         } elseif (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
             /**
-             * @var $user Chamilo\UserBundle\Entity\User
+             * @var Chamilo\UserBundle\Entity\User
              */
             $user = UserManager::getRepository()->find(api_get_user_id());
             if ($user && !$user->getCurrentlyAccessibleSessions()) {
@@ -175,7 +175,7 @@ if ($action == 'subscribe') {
                 $redirectionTarget = api_get_path(WEB_PATH).'course/'.$courseId.'/about';
             }
         }
-        header('Location: ' . $redirectionTarget);
+        header('Location: '.$redirectionTarget);
         exit;
     }
 }

main/exercise/exercise.class.php

@@ -8530,7 +8530,7 @@ class Exercise
                 $hiddenFromSessionCondition = ' 1=1 ';
 
                 if (!empty($result)) {
-                    $hiddenFromSession = implode("','",  array_column($result, 'iid'));
+                    $hiddenFromSession = implode("','", array_column($result, 'iid'));
                     $hiddenFromSessionCondition = " e.iid not in ('$hiddenFromSession')";
                 }
                 $condition_session = " AND (

main/exercise/exercise_admin.php

@@ -8,6 +8,7 @@ use ChamiloSession as Session;
  * Exercise administration
  * This script allows to manage an exercise. It is included from
  * the script admin.php.
+ *
  * @author Olivier Brouckaert, Julio Montoya
  */
 require_once __DIR__.'/../inc/global.inc.php';

main/exercise/exercise_submit.php

@@ -1416,7 +1416,6 @@ if (!empty($error)) {
                         break;
                     }
                 }
-
             }
         }
 

main/exercise/question_pool.php

@@ -521,8 +521,6 @@ echo '<script>$(function () {
 <?php
 
 /**
- * @param array $formValues
- *
  * @return array
  */
 function getExtraFieldConditions(array $formValues, $queryType = 'from')

main/gradebook/lib/fe/catform.class.php

@@ -393,7 +393,7 @@ class CatForm extends FormValidator
         }
 
         //if (!empty($session_id)) {
-            $isRequirementCheckbox = $this->addCheckBox(
+        $isRequirementCheckbox = $this->addCheckBox(
                 'is_requirement',
                 [
                     null,

main/inc/ajax/model.ajax.php

@@ -1667,7 +1667,7 @@ switch ($action) {
         $columns = $sessionColumns['simple_column_name'];
 
         switch ($listType) {
-            case 'complete' :
+            case 'complete':
                 $result = SessionManager::get_sessions_admin_complete(
                     [
                         'where' => $whereCondition,

main/inc/ajax/sequence.ajax.php

@@ -440,7 +440,6 @@ switch ($action) {
         $view->assign('sequence_type', $type);
         $view->assign('allow_subscription', $allowSubscription);
 
-
         if ($allowSubscription) {
             $view->assign(
                 'subscribe_button',

main/inc/ajax/statistics.ajax.php

@@ -428,13 +428,13 @@ switch ($action) {
                         $years = (int) $interval->y;
 
                         if ($years >= 16 && $years <= 17) {
-                            $all['16-17'] += 1;
+                            $all['16-17']++;
                         }
                         if ($years >= 18 && $years <= 25) {
-                            $all['18-25'] += 1;
+                            $all['18-25']++;
                         }
                         if ($years >= 26 && $years <= 30) {
-                            $all['26-30'] += 1;
+                            $all['26-30']++;
                         }
                         /*if ($years >= 31) {
                             $all[get_lang('N/A')] += 1;
@@ -658,7 +658,7 @@ switch ($action) {
                     if (!isset($all[$language])) {
                         $all[$language] = 0;
                     }
-                    $all[$language] += 1;
+                    $all[$language]++;
                 }
                 break;
             case 'course_in_session':

main/inc/lib/course.lib.php

@@ -565,7 +565,7 @@ class CourseManager
 
         if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
             /**
-             * @var $user Chamilo\UserBundle\Entity\User
+             * @var Chamilo\UserBundle\Entity\User
              */
             $user = UserManager::getRepository()->find($userId);
             $sessions = $user->getCurrentlyAccessibleSessions();
@@ -579,6 +579,7 @@ class CourseManager
                             'warning'
                         )
                     );
+
                     return false;
                 }
                 // user has no session at all, create one starting now
@@ -588,10 +589,11 @@ class CourseManager
                 } catch (Exception $exception) {
                     Display::addFlash(
                         Display::return_message(
-                            get_lang('WrongNumberOfDays') . ': ' . $numberOfDays . ': ' . $exception->getMessage(),
+                            get_lang('WrongNumberOfDays').': '.$numberOfDays.': '.$exception->getMessage(),
                             'warning'
                         )
                     );
+
                     return false;
                 }
                 $endDate = new DateTime();
@@ -612,10 +614,11 @@ class CourseManager
                 } catch (\Doctrine\ORM\OptimisticLockException $exception) {
                     Display::addFlash(
                         Display::return_message(
-                            get_lang('InternalDatabaseError') . ': ' . $exception->getMessage(),
+                            get_lang('InternalDatabaseError').': '.$exception->getMessage(),
                             'warning'
                         )
                     );
+
                     return false;
                 }
                 $accessUrlRelSession = new \Chamilo\CoreBundle\Entity\AccessUrlRelSession();
@@ -627,10 +630,11 @@ class CourseManager
                 } catch (\Doctrine\ORM\OptimisticLockException $exception) {
                     Display::addFlash(
                         Display::return_message(
-                            get_lang('InternalDatabaseError') . ': ' . $exception->getMessage(),
+                            get_lang('InternalDatabaseError').': '.$exception->getMessage(),
                             'warning'
                         )
                     );
+
                     return false;
                 }
             } else {
@@ -645,16 +649,19 @@ class CourseManager
             } catch (\Doctrine\ORM\OptimisticLockException $exception) {
                 Display::addFlash(
                     Display::return_message(
-                        get_lang('InternalDatabaseError') . ': ' . $exception->getMessage(),
+                        get_lang('InternalDatabaseError').': '.$exception->getMessage(),
                         'warning'
                     )
                 );
+
                 return false;
             }
             // subscribe user to course within this session
             SessionManager::subscribe_users_to_session_course([$userId], $session->getId(), $course->getCode());
+
             return true;
         }
+
         return self::subscribeUser($userId, $course->getCode(), $status);
     }
 
@@ -1183,23 +1190,24 @@ class CourseManager
         if (api_get_configuration_value('catalog_course_subscription_in_user_s_session')) {
             // with this option activated, only check whether the course is in one of the users' sessions
             $course = Database::getManager()->getRepository('ChamiloCoreBundle:Course')->findOneBy([
-                'code' => $course_code
+                'code' => $course_code,
             ]);
             if (is_null($course)) {
                 return false;
             }
             /**
-             * @var $user \Chamilo\UserBundle\Entity\User
+             * @var \Chamilo\UserBundle\Entity\User
              */
             $user = UserManager::getRepository()->find($user_id);
             if (is_null($user)) {
                 return false;
             }
-            foreach($user->getStudentSessions() as $session) {
+            foreach ($user->getStudentSessions() as $session) {
                 if ($session->isRelatedToCourse($course)) {
                     return true;
                 }
             }
+
             return false;
         }
 

main/inc/lib/course_category.lib.php

@@ -156,6 +156,7 @@ class CourseCategory
                 ORDER BY t1.parent_id, t1.tree_pos";
 
         $result = Database::query($sql);
+
         return Database::store_result($result, 'ASSOC');
     }
 

main/inc/lib/display.lib.php

@@ -2583,7 +2583,7 @@ class Display
      * @param string $content
      * @param string $title
      * @param string $footer
-     * @param string $type        primary|success|info|warning|danger
+     * @param string $type            primary|success|info|warning|danger
      * @param string $extra
      * @param string $id
      * @param string $backgroundColor

main/inc/lib/extra_field_value.lib.php

@@ -812,10 +812,10 @@ class ExtraFieldValue extends Model
      * Gets the ID from the item (course, session, etc) for which
      * the given field is defined with the given value.
      *
-     * @param string $variable Field (type of data) we want to check
+     * @param string $variable  Field (type of data) we want to check
-     * @param string $value    Data we are looking for in the given field
+     * @param string $value     Data we are looking for in the given field
-     * @param bool   $transform      Whether to transform the result to a human readable strings
+     * @param bool   $transform Whether to transform the result to a human readable strings
-     * @param bool   $last           Whether to return the last element or simply the first one we get
+     * @param bool   $last      Whether to return the last element or simply the first one we get
      * @param bool   $useLike
      *
      * @return mixed Give the ID if found, or false on failure or not found

main/inc/lib/formvalidator/Element/SelectAjax.php

@@ -44,7 +44,7 @@ class SelectAjax extends HTML_QuickForm_select
 
         $plHolder = $this->getAttribute('placeholder');
         if (empty($plHolder)) {
-            $plHolder = preg_replace("/'/","\\'",get_lang('SelectAnOption'));
+            $plHolder = preg_replace("/'/", "\\'", get_lang('SelectAnOption'));
         }
 
         $id = $this->getAttribute('id');

main/inc/lib/plugin.lib.php

@@ -126,7 +126,8 @@ class AppPlugin
     }
 
     /**
-     * Returns a list of all installed plugins
+     * Returns a list of all installed plugins.
+     *
      * @param bool $fromDatabase
      *
      * @return array
@@ -164,6 +165,7 @@ class AppPlugin
      * Returns a list of all official (delivered with the Chamilo package)
      * plugins. This list is maintained manually and updated with every new
      * release to avoid hacking.
+     *
      * @return array
      */
     public function getOfficialPlugins()

main/inc/lib/sessionmanager.lib.php

@@ -130,27 +130,27 @@ class SessionManager
      *
      * @author Carlos Vargas <carlos.vargas@beeznest.com>, from existing code
      *
-     * @param string   $name
+     * @param string $name
-     * @param string   $startDate                    (YYYY-MM-DD hh:mm:ss)
+     * @param string $startDate                    (YYYY-MM-DD hh:mm:ss)
-     * @param string   $endDate                      (YYYY-MM-DD hh:mm:ss)
+     * @param string $endDate                      (YYYY-MM-DD hh:mm:ss)
-     * @param string   $displayStartDate             (YYYY-MM-DD hh:mm:ss)
+     * @param string $displayStartDate             (YYYY-MM-DD hh:mm:ss)
-     * @param string   $displayEndDate               (YYYY-MM-DD hh:mm:ss)
+     * @param string $displayEndDate               (YYYY-MM-DD hh:mm:ss)
-     * @param string   $coachStartDate               (YYYY-MM-DD hh:mm:ss)
+     * @param string $coachStartDate               (YYYY-MM-DD hh:mm:ss)
-     * @param string   $coachEndDate                 (YYYY-MM-DD hh:mm:ss)
+     * @param string $coachEndDate                 (YYYY-MM-DD hh:mm:ss)
-     * @param mixed    $coachId                      If int, this is the session coach id,
+     * @param mixed  $coachId                      If int, this is the session coach id,
-     *                                               if string, the coach ID will be looked for from the user table
+     *                                             if string, the coach ID will be looked for from the user table
-     * @param int      $sessionCategoryId            ID of the session category in which this session is registered
+     * @param int    $sessionCategoryId            ID of the session category in which this session is registered
-     * @param int      $visibility                   Visibility after end date (0 = read-only, 1 = invisible, 2 = accessible)
+     * @param int    $visibility                   Visibility after end date (0 = read-only, 1 = invisible, 2 = accessible)
-     * @param bool     $fixSessionNameIfExists
+     * @param bool   $fixSessionNameIfExists
-     * @param string   $duration
+     * @param string $duration
-     * @param string   $description                  Optional. The session description
+     * @param string $description                  Optional. The session description
-     * @param int      $showDescription              Optional. Whether show the session description
+     * @param int    $showDescription              Optional. Whether show the session description
-     * @param array    $extraFields
+     * @param array  $extraFields
-     * @param int      $sessionAdminId               Optional. If this sessions was created by a session admin, assign it to him
+     * @param int    $sessionAdminId               Optional. If this sessions was created by a session admin, assign it to him
-     * @param bool     $sendSubscriptionNotification Optional.
+     * @param bool   $sendSubscriptionNotification Optional.
-     *                                               Whether send a mail notification to users being subscribed
+     *                                             Whether send a mail notification to users being subscribed
-     * @param int      $accessUrlId                  Optional.
+     * @param int    $accessUrlId                  Optional.
-     * @param int      $status
+     * @param int    $status
      *
      * @return mixed Session ID on success, error message otherwise
      *
@@ -667,10 +667,10 @@ class SessionManager
     /**
      * Gets the admin session list callback of the session/session_list.php page.
      *
-     * @param array $options           order and limit keys
+     * @param array  $options           order and limit keys
-     * @param bool  $getCount          Whether to get all the results or only the count
+     * @param bool   $getCount          Whether to get all the results or only the count
-     * @param array $columns
+     * @param array  $columns
-     * @param array $extraFieldsToLoad
+     * @param array  $extraFieldsToLoad
      * @param string $listType
      *
      * @return mixed Integer for number of rows, or array of results
@@ -9408,6 +9408,85 @@ class SessionManager
         return $result;
     }
 
+    public static function getStatusList()
+    {
+        return [
+            self::STATUS_PLANNED => get_lang('Planned'),
+            self::STATUS_PROGRESS => get_lang('InProgress'),
+            self::STATUS_FINISHED => get_lang('Finished'),
+            self::STATUS_CANCELLED => get_lang('Cancelled'),
+        ];
+    }
+
+    public static function getStatusLabel($status)
+    {
+        $list = self::getStatusList();
+
+        if (!isset($list[$status])) {
+            return get_lang('NoStatus');
+        }
+
+        return $list[$status];
+    }
+
+    public static function getDefaultSessionTab()
+    {
+        $default = 'all';
+        $view = api_get_configuration_value('default_session_list_view');
+
+        if (!empty($view)) {
+            $default = $view;
+        }
+
+        return $default;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getSessionListTabs($listType)
+    {
+        $tabs = [
+            [
+                'content' => get_lang('AllSessionsShort'),
+                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=all',
+            ],
+            [
+                'content' => get_lang('ActiveSessionsShort'),
+                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=active',
+            ],
+            [
+                'content' => get_lang('ClosedSessionsShort'),
+                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=close',
+            ],
+            [
+                'content' => get_lang('SessionListCustom'),
+                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=custom',
+            ],
+            /*[
+                'content' => get_lang('Complete'),
+                'url' => api_get_path(WEB_CODE_PATH).'session/session_list_simple.php?list_type=complete',
+            ],*/
+        ];
+
+        switch ($listType) {
+            case 'all':
+                $default = 1;
+                break;
+            case 'active':
+                $default = 2;
+                break;
+            case 'close':
+                $default = 3;
+                break;
+            case 'custom':
+                $default = 4;
+                break;
+        }
+
+        return Display::tabsOnlyLink($tabs, $default);
+    }
+
     /**
      * @param int $id
      *
@@ -9545,84 +9624,4 @@ class SessionManager
             return -1;
         }
     }
-
-    public static function getStatusList()
-    {
-        return [
-            self::STATUS_PLANNED => get_lang('Planned'),
-            self::STATUS_PROGRESS => get_lang('InProgress'),
-            self::STATUS_FINISHED => get_lang('Finished'),
-            self::STATUS_CANCELLED => get_lang('Cancelled'),
-        ];
-    }
-
-    public static function getStatusLabel($status)
-    {
-        $list = self::getStatusList();
-
-        if (!isset($list[$status])) {
-
-            return get_lang('NoStatus');
-        }
-
-        return $list[$status];
-    }
-
-    public static function getDefaultSessionTab()
-    {
-        $default = 'all';
-        $view = api_get_configuration_value('default_session_list_view');
-
-        if (!empty($view)) {
-            $default = $view;
-        }
-
-        return $default;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getSessionListTabs($listType)
-    {
-        $tabs = [
-            [
-                'content' => get_lang('AllSessionsShort'),
-                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=all',
-            ],
-            [
-                'content' => get_lang('ActiveSessionsShort'),
-                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=active',
-            ],
-            [
-                'content' => get_lang('ClosedSessionsShort'),
-                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=close',
-            ],
-            [
-                'content' => get_lang('SessionListCustom'),
-                'url' => api_get_path(WEB_CODE_PATH).'session/session_list.php?list_type=custom',
-            ],
-            /*[
-                'content' => get_lang('Complete'),
-                'url' => api_get_path(WEB_CODE_PATH).'session/session_list_simple.php?list_type=complete',
-            ],*/
-        ];
-
-        switch ($listType) {
-            case 'all':
-                $default = 1;
-                break;
-            case 'active':
-                $default = 2;
-                break;
-            case 'close':
-                $default = 3;
-                break;
-            case 'custom':
-                $default = 4;
-                break;
-        }
-
-        return Display::tabsOnlyLink($tabs, $default);
-    }
 }

main/inc/lib/system_announcements.lib.php

@@ -2,8 +2,6 @@
 
 /* For licensing terms, see /license.txt */
 
-use Chamilo\CoreBundle\Entity\SessionRelUser;
-
 /**
  * Class SystemAnnouncementManager.
  */

main/inc/lib/thematic.lib.php

@@ -1189,7 +1189,6 @@ class Thematic
         $all = [];
         if (!empty($thematic_data)) {
             foreach ($thematic_data as $thematic) {
-                $thematic_id = $thematic['id'];
                 if (!empty($thematic_advance_data[$thematic['id']])) {
                     foreach ($thematic_advance_data[$thematic['id']] as $thematic_advance) {
                         $all[] = $thematic_advance['id'];

main/inc/lib/tracking.lib.php

@@ -1995,7 +1995,7 @@ class Tracking
      * @param int         User id
      * @param array $courseInfo real_id and code are used
      * @param int            Session id (optional, default=0)
-     * @param bool  $convert_date
+     * @param bool $convert_date
      *
      * @return string|bool Date with format long without day or false if there is no date
      */

main/inc/lib/usermanager.lib.php

@@ -3179,8 +3179,8 @@ class UserManager
     /**
      * Get extra user data by value.
      *
-     * @param string $variable       the internal variable name of the field
+     * @param string $variable the internal variable name of the field
-     * @param string $value          the internal value of the field
+     * @param string $value    the internal value of the field
      * @param bool   $useLike
      *
      * @return array with extra data info of a user i.e array('field_variable'=>'value');

main/inc/lib/webservices/Rest.php

@@ -91,9 +91,9 @@ class Rest extends WebService
      * @param string $username
      * @param string $apiKeyToValidate
      *
-     * @return Rest
      * @throws Exception
      *
+     * @return Rest
      */
     public static function validate($username, $apiKeyToValidate)
     {
@@ -309,11 +309,11 @@ class Rest extends WebService
     /**
      * Get the user courses.
      *
-     * @return array
      * @throws \Doctrine\ORM\TransactionRequiredException
      * @throws \Doctrine\ORM\ORMException
-     *
      * @throws \Doctrine\ORM\OptimisticLockException
+     *
+     * @return array
      */
     public function getUserCourses()
     {
@@ -342,9 +342,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseInfo()
     {
@@ -374,9 +374,9 @@ class Rest extends WebService
     /**
      * Get the course descriptions.
      *
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseDescriptions()
     {
@@ -398,9 +398,9 @@ class Rest extends WebService
     /**
      * @param int $directoryId
      *
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseDocuments($directoryId = 0)
     {
@@ -476,9 +476,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseAnnouncements()
     {
@@ -517,9 +517,9 @@ class Rest extends WebService
     /**
      * @param int $announcementId
      *
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseAnnouncement($announcementId)
     {
@@ -552,9 +552,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseAgenda()
     {
@@ -609,9 +609,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseNotebooks()
     {
@@ -639,9 +639,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseForumCategories()
     {
@@ -712,9 +712,9 @@ class Rest extends WebService
     /**
      * @param int $forumId
      *
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseForum($forumId)
     {
@@ -837,9 +837,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function getCourseLearnPaths()
     {
@@ -951,24 +951,6 @@ class Rest extends WebService
         return $categoryData;
     }
 
-    /**
-     * @param array $additionalParams Optional
-     *
-     * @return string
-     */
-    private function encodeParams(array $additionalParams = [])
-    {
-        $params = array_merge(
-            $additionalParams,
-            [
-                'api_key' => $this->apiKey,
-                'username' => $this->user->getUsername(),
-            ]
-        );
-
-        return json_encode($params);
-    }
-
     /**
      * Start login for a user. Then make a redirect to show the learnpath.
      *
@@ -1304,9 +1286,9 @@ class Rest extends WebService
     /**
      * @param $userParam
      *
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function addUser($userParam)
     {
@@ -1558,9 +1540,9 @@ class Rest extends WebService
     }
 
     /**
-     * @return array
      * @throws Exception
      *
+     * @return array
      */
     public function addCoursesSession(array $params)
     {
@@ -1620,9 +1602,9 @@ class Rest extends WebService
      * @param $startDate
      * @param $endDate
      *
-     * @return int, the id of the new session
      * @throws Exception
      *
+     * @return int, the id of the new session
      */
     public function createSessionFromModel($modelSessionId, $sessionName, $startDate, $endDate, array $extraFields = [])
     {
@@ -1720,12 +1702,12 @@ class Rest extends WebService
     /**
      * subscribes a user to a session.
      *
-     * @param int $sessionId    the session id
+     * @param int    $sessionId the session id
      * @param string $loginName the user's login name
      *
-     * @return boolean, whether it worked
      * @throws Exception
      *
+     * @return boolean, whether it worked
      */
     public function subscribeUserToSessionFromUsername($sessionId, $loginName)
     {
@@ -1757,9 +1739,9 @@ class Rest extends WebService
      * @param $fieldName
      * @param $fieldValue
      *
-     * @return int, the matching session id
      * @throws Exception when no session matched or more than one session matched
      *
+     * @return int, the matching session id
      */
     public function getSessionFromExtraField($fieldName, $fieldValue)
     {
@@ -1792,9 +1774,9 @@ class Rest extends WebService
      *
      * @param array $parameters
      *
-     * @return boolean, true on success
      * @throws Exception on failure
      *
+     * @return boolean, true on success
      */
     public function updateUserFromUserName($parameters)
     {
@@ -1927,9 +1909,7 @@ class Rest extends WebService
                                     $fieldValue = $field['field_value'];
                                     if (!isset($fieldName) || !isset($fieldValue) ||
                                         !UserManager::update_extra_field_value($userId, $fieldName, $fieldValue)) {
-                                        throw new Exception(
+                                        throw new Exception(get_lang('CouldNotUpdateExtraFieldValue').': '.print_r($field, true));
-                                            get_lang('CouldNotUpdateExtraFieldValue').': '.print_r($field, true)
-                                        );
                                     }
                                 }
                             } else {
@@ -1998,4 +1978,22 @@ class Rest extends WebService
     {
         return false !== api_get_user_info_from_username($loginname);
     }
+
+    /**
+     * @param array $additionalParams Optional
+     *
+     * @return string
+     */
+    private function encodeParams(array $additionalParams = [])
+    {
+        $params = array_merge(
+            $additionalParams,
+            [
+                'api_key' => $this->apiKey,
+                'username' => $this->user->getUsername(),
+            ]
+        );
+
+        return json_encode($params);
+    }
 }

main/inc/lib/webservices/WebService.class.php

@@ -77,9 +77,9 @@ class WebService
      * @param string $username
      * @param string $password
      *
-     * @return bool Return true if the password belongs to the username. Otherwise return false
      * @throws Exception
      *
+     * @return bool Return true if the password belongs to the username. Otherwise return false
      */
     public static function isValidUser($username, $password)
     {

main/lp/learnpath.class.php

@@ -2571,6 +2571,7 @@ class learnpath
                     $percentage = $score;
                     $text = '/'.$maxScore;
                 }
+
                 return [$percentage, $text];
             }
         }
@@ -13671,6 +13672,53 @@ EOD;
         return $arrLP;
     }
 
+    /**
+     * Gets whether this SCORM learning path has been marked to use the score
+     * as progress. Takes into account whether the learnpath matches (SCORM
+     * content + less than 2 items).
+     *
+     * @return bool True if the score should be used as progress, false otherwise
+     */
+    public function getUseScoreAsProgress()
+    {
+        // If not a SCORM, we don't care about the setting
+        if ($this->get_type() != 2) {
+            return false;
+        }
+        // If more than one step in the SCORM, we don't care about the setting
+        if ($this->get_total_items_count() > 1) {
+            return false;
+        }
+        $extraFieldValue = new ExtraFieldValue('lp');
+        $doUseScore = false;
+        $useScore = $extraFieldValue->get_values_by_handler_and_field_variable($this->get_id(), 'use_score_as_progress');
+        if (!empty($useScore) && isset($useScore['value'])) {
+            $doUseScore = $useScore['value'];
+        }
+
+        return $doUseScore;
+    }
+
+    /**
+     * Get the user identifier (user_id or username
+     * Depends on scorm_api_username_as_student_id in app/config/configuration.php.
+     *
+     * @return string User ID or username, depending on configuration setting
+     */
+    public static function getUserIdentifierForExternalServices()
+    {
+        if (api_get_configuration_value('scorm_api_username_as_student_id')) {
+            return api_get_user_info(api_get_user_id())['username'];
+        } elseif (api_get_configuration_value('scorm_api_extrafield_to_use_as_student_id') != null) {
+            $extraFieldValue = new ExtraFieldValue('user');
+            $extrafield = $extraFieldValue->get_values_by_handler_and_field_variable(api_get_user_id(), api_get_configuration_value('scorm_api_extrafield_to_use_as_student_id'));
+
+            return $extrafield['value'];
+        } else {
+            return api_get_user_id();
+        }
+    }
+
     /**
      * Get the depth level of LP item.
      *
@@ -13775,47 +13823,4 @@ EOD;
 
         return '';
     }
-    /**
-     * Gets whether this SCORM learning path has been marked to use the score
-     * as progress. Takes into account whether the learnpath matches (SCORM
-     * content + less than 2 items).
-     * @return bool True if the score should be used as progress, false otherwise
-     */
-    public function getUseScoreAsProgress()
-    {
-        // If not a SCORM, we don't care about the setting
-        if ($this->get_type() != 2) {
-            return false;
-        }
-        // If more than one step in the SCORM, we don't care about the setting
-        if ($this->get_total_items_count() > 1) {
-            return false;
-        }
-        $extraFieldValue = new ExtraFieldValue('lp');
-        $doUseScore = false;
-        $useScore = $extraFieldValue->get_values_by_handler_and_field_variable($this->get_id(), 'use_score_as_progress');
-        if (!empty($useScore) && isset($useScore['value'])) {
-            $doUseScore = $useScore['value'];
-        }
-
-        return $doUseScore;
-    }
-    /**
-     * Get the user identifier (user_id or username
-     * Depends on scorm_api_username_as_student_id in app/config/configuration.php
-     *
-     * @return string User ID or username, depending on configuration setting
-     */
-    public static function getUserIdentifierForExternalServices()
-    {
-        if (api_get_configuration_value('scorm_api_username_as_student_id')) {
-            return api_get_user_info(api_get_user_id())['username'];
-	} elseif (api_get_configuration_value('scorm_api_extrafield_to_use_as_student_id') != null) {
-            $extraFieldValue = new ExtraFieldValue('user');
-            $extrafield = $extraFieldValue->get_values_by_handler_and_field_variable(api_get_user_id(), api_get_configuration_value('scorm_api_extrafield_to_use_as_student_id'));
-            return $extrafield['value'];
-        } else {
-            return api_get_user_id();
-        } 
-    }
 }

main/lp/lp_ajax_switch_item_toc.php

@@ -168,8 +168,6 @@ function switch_item_toc($lpId, $userId, $viewId, $currentItem, $nextItem)
         $return .= "update_progress_bar('$completedItems','$totalItems','$progressMode');";
     }
 
-
-
     $myLP->set_error_msg('');
     $myLP->prerequisites_match(); // Check the prerequisites are all complete.
     if ($debug > 1) {

main/lp/lp_edit.php

@@ -273,7 +273,6 @@ $extra = $extraField->addElements(
 
 $skillList = Skill::addSkillsToForm($form, ITEM_TYPE_LEARNPATH, $lpId);
 
-
 // Submit button
 $form->addButtonSave(get_lang('SaveLPSettings'));
 

main/lp/scorm_api.php

@@ -54,7 +54,7 @@ header('Content-type: text/javascript');
 
 ?>var scorm_logs=<?php echo (empty($oLP->scorm_debug) or (!api_is_course_admin() && !api_is_platform_admin())) ? '0' : '3'; ?>; //debug log level for SCORM. 0 = none, 1=light, 2=a lot, 3=all - displays logs in log frame
 var lms_logs = 0; //debug log level for LMS actions. 0=none, 1=light, 2=a lot, 3=all
-var score_as_progress = <?php echo (empty($oLP->getUseScoreAsProgress())? 'false':'true'); ?>;
+var score_as_progress = <?php echo empty($oLP->getUseScoreAsProgress()) ? 'false' : 'true'; ?>;
 
 // API Object initialization (eases access later on)
 function APIobject() {

main/mySpace/access_details_session.php

@@ -390,7 +390,6 @@ if ($form->validate()) {
 $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('AccessDetails')];
 $userInfo = api_get_user_info($userId);
 
-
 $form->setDefaults(['from' => $startDate, 'to' => $endDate]);
 
 $formByDay = new FormValidator(

main/session/resume_session.php

@@ -12,7 +12,6 @@ use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 /**
  * @author  Bart Mollet, Julio Montoya lot of fixes
  */
-
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 

main/session/session_list.php

@@ -289,7 +289,7 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
             original_cols = grid.jqGrid('getGridParam', 'colModel');
 
             <?php if ($allowOrder) {
-            ?>
+                ?>
             options = {
                 update: function (e, ui) {
                     var rowNum = jQuery("#sessions").getGridParam('rowNum');

main/session/session_list_custom.php

@@ -273,7 +273,8 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
 
             // Sortable rows
             grid.jqGrid('sortableRows', options);
-            <?php } ?>
+            <?php
+            } ?>
 
             grid.jqGrid('navGrid','#sessions_pager',
                 {edit:false,add:false,del:false},

main/survey/create_new_survey.php

@@ -209,7 +209,7 @@ $form->addElement(
 $extraField = new ExtraField('survey');
 $extraField->addElements($form, $survey_id, ['group_id']);
 
-if ($extraField->get_handler_field_info_by_field_variable('group_id') ) {
+if ($extraField->get_handler_field_info_by_field_variable('group_id')) {
     $extraFieldValue = new ExtraFieldValue('survey');
     $groupData = $extraFieldValue->get_values_by_handler_and_field_variable($survey_id, 'group_id');
     $groupValue = [];

main/survey/survey.lib.php

@@ -2196,7 +2196,7 @@ class SurveyManager
             }
             $classToParse[] = [
                 'name' => $class['name'],
-                'users' => $users
+                'users' => $users,
             ];
         }
 
@@ -2212,9 +2212,9 @@ class SurveyManager
                     $users = array_column($users, 'id');
                     $classToParse = [
                         [
-                            'name' =>  $groupInfo['name'],
+                            'name' => $groupInfo['name'],
-                            'users'=> $users
+                            'users' => $users,
-                        ]
+                        ],
                     ];
                     self::parseMultiplicateUserList($classToParse, $questions, $courseId, $surveyData);
                 }

main/survey/surveyUtil.class.php

@@ -2250,12 +2250,6 @@ class SurveyUtil
         return $counter;
     }
 
-    /**
-     * @param CSurvey $survey
-     * @param         $content
-     * @param         $subject
-     * @param         $remind
-     */
     public static function saveInviteMail(CSurvey $survey, $content, $subject, $remind)
     {
         // Reminder or not

main/survey/survey_list.php

@@ -10,7 +10,6 @@ use ChamiloSession as Session;
  *
  * @todo use quickforms for the forms
  */
-
 if (!isset($_GET['cidReq'])) {
     $_GET['cidReq'] = 'none'; // Prevent sql errors
     $cidReset = true;

main/tracking/courseLog.php

@@ -546,7 +546,7 @@ if ($nbStudents > 0) {
 
     if (empty($sessionId)) {
         $table->set_header(12, get_lang('Survey'), false);
-	$headers['survey'] = get_lang('Survey');
+        $headers['survey'] = get_lang('Survey');
     } else {
         $table->set_header(12, get_lang('RegisteredDate'), false);
         $headers['registered_at'] = get_lang('RegisteredDate');

main/tracking/lp_report.php

@@ -25,7 +25,6 @@ $htmlHeadXtra[] = '<script>
     });
 </script>';
 
-
 $lps = learnpath::getLpList($courseId);
 Session::write('lps', $lps);
 
@@ -274,7 +273,6 @@ function getCount()
     }
 
     return $count;
-
 }
 
 /**

src/Chamilo/CoreBundle/Entity/Repository/SequenceResourceRepository.php

@@ -10,7 +10,7 @@ use Fhaculty\Graph\Set\Vertices;
 use Fhaculty\Graph\Vertex;
 
 /**
- * Class SequenceResourceRepository
+ * Class SequenceResourceRepository.
  */
 class SequenceResourceRepository extends EntityRepository
 {
@@ -198,40 +198,6 @@ class SequenceResourceRepository extends EntityRepository
         return $result;
     }
 
-    /**
-     * Get sessions from vertices.
-     *
-     * @param Vertices $verticesEdges The vertices
-     * @param int      $type
-     *
-     * @return array
-     */
-    protected function findVerticesEdges(Vertices $verticesEdges, $type)
-    {
-        $sessionVertices = [];
-        $em = $this->getEntityManager();
-
-        foreach ($verticesEdges as $supVertex) {
-            $vertexId = $supVertex->getId();
-            switch ($type) {
-                case SequenceResource::SESSION_TYPE:
-                    $resource = $em->getRepository('ChamiloCoreBundle:Session')->find($vertexId);
-                    break;
-                case SequenceResource::COURSE_TYPE:
-                    $resource = $em->getRepository('ChamiloCoreBundle:Course')->find($vertexId);
-                    break;
-            }
-
-            if (empty($resource)) {
-                continue;
-            }
-
-            $sessionVertices[$vertexId] = $resource;
-        }
-
-        return $sessionVertices;
-    }
-
     /**
      * Check if the ser has completed the requirements for the sequences.
      *
@@ -405,4 +371,38 @@ class SequenceResourceRepository extends EntityRepository
 
         return false;
     }
+
+    /**
+     * Get sessions from vertices.
+     *
+     * @param Vertices $verticesEdges The vertices
+     * @param int      $type
+     *
+     * @return array
+     */
+    protected function findVerticesEdges(Vertices $verticesEdges, $type)
+    {
+        $sessionVertices = [];
+        $em = $this->getEntityManager();
+
+        foreach ($verticesEdges as $supVertex) {
+            $vertexId = $supVertex->getId();
+            switch ($type) {
+                case SequenceResource::SESSION_TYPE:
+                    $resource = $em->getRepository('ChamiloCoreBundle:Session')->find($vertexId);
+                    break;
+                case SequenceResource::COURSE_TYPE:
+                    $resource = $em->getRepository('ChamiloCoreBundle:Course')->find($vertexId);
+                    break;
+            }
+
+            if (empty($resource)) {
+                continue;
+            }
+
+            $sessionVertices[$vertexId] = $resource;
+        }
+
+        return $sessionVertices;
+    }
 }

src/Chamilo/CoreBundle/Entity/Session.php

@@ -412,9 +412,8 @@ class Session
     }
 
     /**
-     * Check for existence of a relation (SessionRelCourse) between a course and this session
+     * Check for existence of a relation (SessionRelCourse) between a course and this session.
      *
-     * @param Course $course
      * @return bool whether the course is related to this session
      */
     public function isRelatedToCourse(Course $course)
@@ -928,6 +927,7 @@ class Session
         } catch (\Exception $exception) {
             return false;
         }
+
         return (is_null($this->accessStartDate) || $this->accessStartDate < $now)
             && (is_null($this->accessEndDate) || $now < $this->accessEndDate);
     }

src/Chamilo/UserBundle/Entity/User.php

@@ -2587,12 +2587,14 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
     }
 
     /**
-     * Retreives this user's related sessions
+     * Retreives this user's related sessions.
      *
      * @param int $relationType \Chamilo\CoreBundle\Entity\SessionRelUser::relationTypeList key
+     *
      * @return \Chamilo\CoreBundle\Entity\Session[]
      */
-    public function getSessions($relationType) {
+    public function getSessions($relationType)
+    {
         $sessions = [];
         foreach (\Database::getManager()->getRepository('ChamiloCoreBundle:SessionRelUser')->findBy([
             'user' => $this,
@@ -2601,40 +2603,46 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
                 $sessions[] = $sessionRelUser->getSession();
             }
         }
+
         return $sessions;
     }
 
     /**
-     * Retreives this user's related student sessions
+     * Retreives this user's related student sessions.
      *
      * @return \Chamilo\CoreBundle\Entity\Session[]
      */
-    public function getStudentSessions() {
+    public function getStudentSessions()
+    {
         return $this->getSessions(0);
     }
 
     /**
-     * Retreives this user's related DRH sessions
+     * Retreives this user's related DRH sessions.
      *
      * @return \Chamilo\CoreBundle\Entity\Session[]
      */
-    public function getDRHSessions() {
+    public function getDRHSessions()
+    {
         return $this->getSessions(1);
     }
 
     /**
-     * Retreives this user's related accessible sessions of a type, student by default
+     * Retreives this user's related accessible sessions of a type, student by default.
      *
      * @param int $relationType \Chamilo\CoreBundle\Entity\SessionRelUser::relationTypeList key
+     *
      * @return \Chamilo\CoreBundle\Entity\Session[]
      */
-    public function getCurrentlyAccessibleSessions($relationType = 0) {
+    public function getCurrentlyAccessibleSessions($relationType = 0)
+    {
         $sessions = [];
         foreach ($this->getSessions($relationType) as $session) {
             if ($session->isCurrentlyAccessible()) {
                 $sessions[] = $session;
             }
         }
+
         return $sessions;
     }
 }