diff --git a/main/inc/lib/CourseChatUtils.php b/main/inc/lib/CourseChatUtils.php
index b2effac32c..2e9ba2cef8 100644
--- a/main/inc/lib/CourseChatUtils.php
+++ b/main/inc/lib/CourseChatUtils.php
@@ -177,7 +177,7 @@ class CourseChatUtils
             $fileContent = '
                 <div class="message-teacher">
                     <div class="content-message">
-                        <div class="chat-message-block-name">'.$user->getCompleteName().'</div>
+                        <div class="chat-message-block-name">'.UserManager::formatUserFullName($user).'</div>
                         <div class="chat-message-block-content">'.$message.'</div>
                         <div class="message-date">'.$timeNow.'</div>
                     </div>
@@ -191,7 +191,7 @@ class CourseChatUtils
                     <img class="chat-image" src="'.$userPhoto.'">
                     <div class="icon-message"></div>
                     <div class="content-message">
-                        <div class="chat-message-block-name">'.$user->getCompleteName().'</div>
+                        <div class="chat-message-block-name">'.UserManager::formatUserFullName($user).'</div>
                         <div class="chat-message-block-content">'.$message.'</div>
                         <div class="message-date">'.$timeNow.'</div>
                     </div>
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 2e4c1d687d..e4a954d49d 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -17,10 +17,6 @@ use Symfony\Component\Finder\Finder;
  * @package chamilo.library
  */
 
-/**
- * Constants declaration.
- */
-
 // PHP version requirement.
 define('REQUIRED_PHP_VERSION', '5.6');
 define('REQUIRED_MIN_MEMORY_LIMIT', '128');
diff --git a/main/inc/lib/notebook.lib.php b/main/inc/lib/notebook.lib.php
index 6693993580..524d5105eb 100755
--- a/main/inc/lib/notebook.lib.php
+++ b/main/inc/lib/notebook.lib.php
@@ -147,7 +147,7 @@ class NotebookManager
      */
     public static function update_note($values)
     {
-        if (!is_array($values) or empty($values['note_title'])) {
+        if (!is_array($values) || empty($values['note_title'])) {
             return false;
         }
 
diff --git a/main/template/default/export/pdf_footer.tpl b/main/template/default/export/pdf_footer.tpl
index e46a6bda43..0703fa0389 100644
--- a/main/template/default/export/pdf_footer.tpl
+++ b/main/template/default/export/pdf_footer.tpl
@@ -4,7 +4,7 @@
             <strong>{{ _s.institution }}</strong>
         </td>
         <td class="text-right">
-            <strong> {PAGENO} / {nb} </strong>
+            <strong>{PAGENO} / {nb}</strong>
         </td>
     </tr>
 </table>
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index daddefc1ea..7a352aaab8 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -4897,7 +4897,6 @@ class Wiki
 
             if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
                 // only by professors if page is hidden
-                //only by professors if page is hidden
                 $sql = "SELECT * FROM ".$tbl_wiki." s1
                         WHERE s1.c_id = $course_id AND linksto LIKE '%".Database::escape_string(
                         $page