Use UserManager::formatUserFullName as in v2, format code

main/admin/add_drh_to_user.php

@@ -38,7 +38,7 @@ foreach ($subscribedUsers as $subscribedUser) {
         continue;
     }
 
-    $hrmOptions[$hrm->getId()] = $hrm->getCompleteNameWithUsername();
+    $hrmOptions[$hrm->getId()] = UserManager::formatUserFullName($hrm, true);
 }
 
 $form = new FormValidator('assign_hrm');
@@ -89,7 +89,10 @@ if ($form->validate()) {
 
 $interbreadcrumb[] = ['name' => get_lang('PlatformAdmin'), 'url' => 'index.php'];
 $interbreadcrumb[] = ['name' => get_lang('UserList'), 'url' => 'user_list.php'];
-$interbreadcrumb[] = ['name' => $user->getCompleteName(), 'url' => 'user_information.php?user_id='.$user->getId()];
+$interbreadcrumb[] = [
+    'name' => UserManager::formatUserFullName($user),
+    'url' => 'user_information.php?user_id='.$user->getId(),
+];
 
 $toolName = get_lang('AssignHrmToUser');
 

main/badge/assign.php

@@ -277,7 +277,7 @@ if ($form->validate()) {
             Display::return_message(
                 sprintf(
                     get_lang('TheUserXHasAlreadyAchievedTheSkillY'),
-                    $user->getCompleteName(),
+                    UserManager::formatUserFullName($user),
                     $skill->getName()
                 ),
                 'warning'
@@ -327,7 +327,7 @@ if ($form->validate()) {
                     $subject = get_lang('StudentHadEnoughSkills');
                     $message = sprintf(
                         get_lang('StudentXHadEnoughSkillsToGetSkillXToAssignClickHereX'),
-                        $user->getCompleteName(),
+                        UserManager::formatUserFullName($user),
                         $parentData['name'],
                         $link
                     );
@@ -349,7 +349,7 @@ if ($form->validate()) {
             sprintf(
                 get_lang('SkillXAssignedToUserY'),
                 $skill->getName(),
-                $user->getCompleteName()
+                UserManager::formatUserFullName($user)
             ),
             'success'
         )
@@ -359,7 +359,7 @@ if ($form->validate()) {
     exit;
 }
 
-$form->setDefaults(['user_name' => $user->getCompleteNameWithUsername()]);
+$form->setDefaults(['user_name' => UserManager::formatUserFullName($user, true)]);
 $form->freeze(['user_name']);
 
 if (api_is_drh()) {
@@ -380,7 +380,7 @@ if (api_is_drh()) {
     }
     $interbreadcrumb[] = [
         'url' => api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$userId,
-        'name' => $user->getCompleteName(),
+        'name' => UserManager::formatUserFullName($user),
     ];
 } else {
     $interbreadcrumb[] = [
@@ -393,7 +393,7 @@ if (api_is_drh()) {
     ];
     $interbreadcrumb[] = [
         'url' => api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.$userId,
-        'name' => $user->getCompleteName(),
+        'name' => UserManager::formatUserFullName($user),
     ];
 }
 

main/badge/issued.php

@@ -100,7 +100,7 @@ $skillIssueInfo = [
     'argumentation' => $skillIssue->getArgumentation(),
     'source_name' => $skillIssue->getSourceName(),
     'user_id' => $skillIssue->getUser()->getId(),
-    'user_complete_name' => $skillIssue->getUser()->getCompleteName(),
+    'user_complete_name' => UserManager::formatUserFullName($skillIssue->getUser()),
     'skill_id' => $skillIssue->getSkill()->getId(),
     'skill_badge_image' => Skill::getWebIconPath($skillIssue->getSkill()),
     'skill_name' => $skillIssue->getSkill()->getName(),
@@ -123,7 +123,7 @@ foreach ($skillIssueComments as $comment) {
     $skillIssueInfo['comments'][] = [
         'text' => $comment->getFeedbackText(),
         'value' => $comment->getFeedbackValue(),
-        'giver_complete_name' => $comment->getFeedbackGiver()->getCompleteName(),
+        'giver_complete_name' => UserManager::formatUserFullName($comment->getFeedbackGiver()),
         'datetime' => api_format_date($commentDate, DATE_TIME_FORMAT_SHORT),
     ];
 }
@@ -183,7 +183,7 @@ if ($showLevels && $allowToEdit) {
 
     if ($formAcquiredLevel->validate() && $allowComment) {
         $values = $formAcquiredLevel->exportValues();
-        $level = $skillLevelRepo->find(intval($values['acquired_level']));
+        $level = $skillLevelRepo->find($values['acquired_level']);
         $skillIssue->setAcquiredLevel($level);
 
         $entityManager->persist($skillIssue);

main/badge/issued_all.php

@@ -49,7 +49,7 @@ $userSkills = $skillUserRepo->findBy([
 
 $userInfo = [
     'id' => $user->getId(),
-    'complete_name' => $user->getCompleteName(),
+    'complete_name' => UserManager::formatUserFullName($user),
 ];
 
 $skillInfo = [
@@ -87,7 +87,7 @@ foreach ($userSkills as $index => $skillIssue) {
         'argumentation' => $skillIssue->getArgumentation(),
         'source_name' => $skillIssue->getSourceName(),
         'user_id' => $skillIssue->getUser()->getId(),
-        'user_complete_name' => $skillIssue->getUser()->getCompleteName(),
+        'user_complete_name' => UserManager::formatUserFullName($skillIssue->getUser()),
         'skill_id' => $skillIssue->getSkill()->getId(),
         'skill_badge_image' => Skill::getWebIconPath($skillIssue->getSkill()),
         'skill_name' => $skillIssue->getSkill()->getName(),
@@ -109,7 +109,7 @@ foreach ($userSkills as $index => $skillIssue) {
         $skillIssueInfo['comments'][] = [
             'text' => $comment->getFeedbackText(),
             'value' => $comment->getFeedbackValue(),
-            'giver_complete_name' => $comment->getFeedbackGiver()->getCompleteName(),
+            'giver_complete_name' => UserManager::formatUserFullName($comment->getFeedbackGiver()),
             'datetime' => api_format_date($commentDate, DATE_TIME_FORMAT_SHORT),
         ];
     }

main/course_info/about.php

@@ -64,7 +64,7 @@ $teachersData = [];
 foreach ($courseTeachers as $teacherSubscription) {
     $teacher = $teacherSubscription->getUser();
     $userData = [
-        'complete_name' => $teacher->getCompleteName(),
+        'complete_name' => UserManager::formatUserFullName($teacher),
         'image' => UserManager::getUserPicture(
             $teacher->getId(),
             USER_IMAGE_SIZE_ORIGINAL

main/cron/course_finished.php

@@ -67,7 +67,7 @@ foreach ($sessions as $session) {
         );
 
         $bodyTemplate = new Template(null, false, false, false, false, false);
-        $bodyTemplate->assign('complete_user_name', $user->getCompleteName());
+        $bodyTemplate->assign('complete_user_name', UserManager::formatUserFullName($user));
         $bodyTemplate->assign('session_name', $session->getName());
 
         $bodyLayout = $bodyTemplate->get_template(
@@ -75,7 +75,7 @@ foreach ($sessions as $session) {
         );
 
         api_mail_html(
-            $user->getCompleteName(),
+            UserManager::formatUserFullName($user),
             $user->getEmail(),
             $subjectTemplate->fetch($subjectLayout),
             $bodyTemplate->fetch($bodyLayout),
@@ -84,7 +84,7 @@ foreach ($sessions as $session) {
         );
 
         echo '============'.PHP_EOL;
-        echo "Email sent to: {$user->getCompleteName()} ({$user->getEmail()})".PHP_EOL;
+        echo "Email sent to: ".UserManager::formatUserFullName($user)." ({$user->getEmail()})".PHP_EOL;
         echo "Session: {$session->getName()}".PHP_EOL;
         echo "End date: {$session->getAccessEndDate()->format('Y-m-d h:i')}".PHP_EOL;
     }

main/exercise/exercise.class.php

@@ -6,7 +6,6 @@ use Chamilo\CoreBundle\Entity\TrackEHotspot;
 use ChamiloSession as Session;
 use Doctrine\DBAL\Types\Type;
 
-
 /**
  * Class Exercise.
  *
@@ -129,7 +128,6 @@ class Exercise
         $this->exerciseCategoryId = 0;
         $this->pageResultConfiguration;
 
-
         if (!empty($courseId)) {
             $courseInfo = api_get_course_info_by_id($courseId);
         } else {
@@ -2499,7 +2497,6 @@ class Exercise
             $defaults['index_document'] = 'checked="checked"';
         }
 
-
         $this->setPageResultConfigurationDefaults($defaults);
         $form->setDefaults($defaults);
 

main/forum/forumfunction.inc.php

@@ -2279,7 +2279,7 @@ function getPosts(
                 $postInfo['username_canonical'] = $user->getUsernameCanonical();
                 $postInfo['lastname'] = $user->getLastname();
                 $postInfo['firstname'] = $user->getFirstname();
-                $postInfo['complete_name'] = $user->getCompleteName();
+                $postInfo['complete_name'] = UserManager::formatUserFullName($user);
             }
         }
 

main/gradebook/lib/be/result.class.php

@@ -229,13 +229,13 @@ class Result
     public function addResultLog($userid, $evaluationid)
     {
         if (isset($userid) && isset($evaluationid)) {
-            $tbl_grade_results_log = Database::get_main_table(TABLE_MAIN_GRADEBOOK_RESULT_LOG);
+            $table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_RESULT_LOG);
             $result = new Result();
 
             $arr_result = $result->load(null, $userid, $evaluationid);
             $arr = get_object_vars($arr_result[0]);
 
-            $sql = 'INSERT INTO '.$tbl_grade_results_log
+            $sql = 'INSERT INTO '.$table
                 .' (id_result,user_id, evaluation_id,created_at';
             if (isset($arr['score'])) {
                 $sql .= ',score';

main/inc/lib/tracking.lib.php

@@ -171,10 +171,9 @@ class Tracking
 
         // Extend all button
         $output = '';
+        $url_suffix = '&lp_id='.$lp_id;
         if ($origin === 'tracking') {
             $url_suffix = '&session_id='.$session_id.'&course='.$courseCode.'&student_id='.$user_id.'&lp_id='.$lp_id.'&origin='.$origin;
-        } else {
-            $url_suffix = '&lp_id='.$lp_id;
         }
 
         $extend_all = 0;
@@ -622,7 +621,7 @@ class Tracking
                     $my_lp_view_id = $row['mylpviewid'];
                     $my_path = $row['path'];
                     $result_disabled_ext_all = false;
-                    if ($row['item_type'] == 'quiz') {
+                    if ($row['item_type'] === 'quiz') {
                         // Check results_disabled in quiz table.
                         $my_path = Database::escape_string($my_path);
                         $sql = "SELECT results_disabled

main/inc/lib/usermanager.lib.php

@@ -6696,6 +6696,27 @@ SQL;
         return $calendar;
     }
 
+    /**
+     * Return the user's full name. Optionally with the username.
+     *
+     * @param User $user
+     * @param bool $includeUsername Optional. By default username is not included.
+     *
+     * @return string
+     */
+    public static function formatUserFullName(User $user, $includeUsername = false)
+    {
+        $fullName = api_get_person_name($user->getFirstname(), $user->getLastname());
+
+        if ($includeUsername && api_get_configuration_value('hide_username_with_complete_name') !== true) {
+            $username = $user->getUsername();
+
+            return "$fullName ($username)";
+        }
+
+        return $fullName;
+    }
+
     /**
      * @return EncoderFactory
      */

main/lp/lp_stats.php

@@ -51,7 +51,7 @@ $output = Tracking::getLpStats(
 );
 
 // Origin = tracking means that teachers see that info in the Reporting tool
-if ($origin != 'tracking') {
+if ($origin !== 'tracking') {
     Display::display_reduced_header();
     $output .= '</body></html>';
 }