chamilo / chamilo-lms

main/inc/lib/banner.lib.php

Indentation +21 added lines, -21 removed lines

@@ -47,20 +47,20 @@ 
     $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
-	// Link to my agenda
+    // Link to my agenda
     $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal';
     $navigation['myagenda']['title'] = get_lang('MyAgenda');
     $navigation['myagenda']['key'] = 'agenda';
 
-	// Gradebook
-	if (api_get_setting('gradebook_enable') == 'true') {
+    // Gradebook
+    if (api_get_setting('gradebook_enable') == 'true') {
         $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
-	}
+    }
 
-	// Reporting
-	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+    // Reporting
+    if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
         $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
@@ -84,21 +84,21 @@ 
         $navigation['session_my_progress']['key'] = 'my-progress';
     }
 
-	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+    // Social
+    if (api_get_setting('allow_social_tool')=='true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
-	}
+    }
 
-	// Dashboard
-	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
+    // Dashboard
+    if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php';
         $navigation['dashboard']['title'] = get_lang('Dashboard');
         $navigation['dashboard']['key'] = 'dashboard';
-	}
+    }
 
-	// Reports
+    // Reports
     /*
 	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php';
@@ -121,14 +121,14 @@ 
     }
     // End Custom Tabs
 
-	// Platform administration
-	if (api_is_platform_admin(true)) {
+    // Platform administration
+    if (api_is_platform_admin(true)) {
         $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/';
         $navigation['platform_admin']['title'] = get_lang('PlatformAdmin');
         $navigation['platform_admin']['key'] = 'admin';
-	}
+    }
 
-	return $navigation;
+    return $navigation;
 }
 
 /**
@@ -254,7 +254,7 @@ 
         if ($number &&
             (api_get_setting('showonline', 'world') == 'true' && !$user_id) ||
                 (api_get_setting('showonline', 'users') == 'true' && $user_id)
-           )
+            )
         {
                 $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php" target="_self" title="'.get_lang('UsersOnline').'" >'.
                             Display::return_icon('user.png', get_lang('UsersOnline'), array(), ICON_SIZE_TINY).' '.$number.'</a></li>';
@@ -265,7 +265,7 @@ 
             (is_array($_course) &&
                api_get_setting('showonline', 'course') == 'true' && isset($_course['sysCode'])
             )
-           )
+            )
         {
                 $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php?cidReq='.$_course['sysCode'].'" target="_self">'.
                         Display::return_icon('course.png', get_lang('UsersOnline').' '.get_lang('InThisCourse'), array(), ICON_SIZE_TINY).' '.$number_online_in_course.' </a></li>';
@@ -376,7 +376,7 @@ 
             }
         }
 
-		// Reports
+        // Reports
         if (!empty($possible_tabs['reports'])) {
             if (api_get_setting('show_tabs', 'reports') == 'true') {
                 if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
@@ -623,7 +623,7 @@ 
         $navigation_item_my_courses['title'] = get_lang('MyCourses');
         $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php';
         $navigation[] = $navigation_item_my_courses;
-        */
+         */
         $navigation[] = $navigation_item;
     }
 

Spacing +41 added lines, -41 removed lines

@@ -51,7 +51,7 @@ 
 
 
     // My Profile
-    $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
+    $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '');
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
     $navigation['myprofile']['icon'] = 'profile.png';
@@ -63,7 +63,7 @@ 
 
 	// Gradebook
 	if (api_get_setting('gradebook_enable') == 'true') {
-        $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
+        $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '');
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
         $navigation['mygradebook']['icon'] = 'gradebook.png';
@@ -72,12 +72,12 @@ 
 	// Reporting
 	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
-        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
+        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh() ? 'session.php' : '');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
         $navigation['session_my_space']['key'] = 'my-space';
         $navigation['session_my_space']['icon'] = 'my-space.png';
     } else if (api_is_student_boss()) {
-        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH) . 'mySpace/student.php';
+        $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/student.php';
         $navigation['session_my_space']['title'] = get_lang('MySpace');
         $navigation['session_my_space']['key'] = 'my-space';
         $navigation['session_my_space']['icon'] = 'my-space.png';
@@ -98,7 +98,7 @@ 
     }
 
 	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+	if (api_get_setting('allow_social_tool') == 'true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
@@ -194,7 +194,7 @@ 
     $_course = api_get_course_info();
     $course_id = 0;
     if (!empty($_course)) {
-        $course_id  = $_course['code'];
+        $course_id = $_course['code'];
     }
 
     $user_id = api_get_user_id();
@@ -290,7 +290,7 @@ 
         if (api_get_setting('gradebook_enable') == 'true') {
             if (api_get_setting('show_tabs', 'my_gradebook') == 'true') {
                 $navigation['mygradebook'] = $possible_tabs['mygradebook'];
-            } else{
+            } else {
                 $menu_navigation['mygradebook'] = $possible_tabs['mygradebook'];
             }
         }
@@ -315,7 +315,7 @@ 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
             }
-        } else{
+        } else {
             $menu_navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null;
         }
 
@@ -324,7 +324,7 @@ 
             if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
                 $navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
             }
-        } else{
+        } else {
             $menu_navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null;
         }
 
@@ -422,34 +422,34 @@ 
     $pageContent = '';
     // Get the extra page content, containing the links to add to the tabs
     if (is_file($homepath.$menuTabs.'_'.$lang.$ext) && is_readable($homepath.$menuTabs.'_'.$lang.$ext)) {
-        $pageContent = @(string) file_get_contents($homepath . $menuTabs . '_' . $lang . $ext);
+        $pageContent = @(string) file_get_contents($homepath.$menuTabs.'_'.$lang.$ext);
     } elseif (is_file($homepath.$menuTabs.$lang.$ext) && is_readable($homepath.$menuTabs.$lang.$ext)) {
-        $pageContent = @(string) file_get_contents($homepath . $menuTabs . $lang . $ext);
+        $pageContent = @(string) file_get_contents($homepath.$menuTabs.$lang.$ext);
     }
     // Sanitize page content
     $pageContent = api_to_system_encoding($pageContent, api_detect_encoding(strip_tags($pageContent)));
-    $open = str_replace('{rel_path}',api_get_path(REL_PATH), $pageContent);
+    $open = str_replace('{rel_path}', api_get_path(REL_PATH), $pageContent);
     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
     // Get the extra page content, containing the links to add to the tabs
     //  that are only for users already logged in
     $openMenuTabsLoggedIn = '';
     if (api_get_user_id() && !api_is_anonymous()) {
-        if (is_file($homepath . $menuTabsLoggedIn . '_' . $lang . $ext) && is_readable($homepath . $menuTabsLoggedIn . '_' . $lang . $ext)) {
-            $pageContent = @(string) file_get_contents($homepath . $menuTabsLoggedIn . '_' . $lang . $ext);
+        if (is_file($homepath.$menuTabsLoggedIn.'_'.$lang.$ext) && is_readable($homepath.$menuTabsLoggedIn.'_'.$lang.$ext)) {
+            $pageContent = @(string) file_get_contents($homepath.$menuTabsLoggedIn.'_'.$lang.$ext);
             $pageContent = str_replace('::private', '', $pageContent);
-        } elseif (is_file($homepath . $menuTabsLoggedIn . $lang . $ext) && is_readable($homepath . $menuTabsLoggedIn . $lang . $ext)) {
-            $pageContent = @(string) file_get_contents($homepath . $menuTabsLoggedIn . $lang . $ext);
+        } elseif (is_file($homepath.$menuTabsLoggedIn.$lang.$ext) && is_readable($homepath.$menuTabsLoggedIn.$lang.$ext)) {
+            $pageContent = @(string) file_get_contents($homepath.$menuTabsLoggedIn.$lang.$ext);
             $pageContent = str_replace('::private', '', $pageContent);
         }
 
         $pageContent = api_to_system_encoding($pageContent, api_detect_encoding(strip_tags($pageContent)));
-        $openMenuTabsLoggedIn = str_replace('{rel_path}',api_get_path(REL_PATH), $pageContent);
+        $openMenuTabsLoggedIn = str_replace('{rel_path}', api_get_path(REL_PATH), $pageContent);
         $openMenuTabsLoggedIn = api_to_system_encoding($openMenuTabsLoggedIn, api_detect_encoding(strip_tags($openMenuTabsLoggedIn)));
     }
     if (!empty($open) OR !empty($openMenuTabsLoggedIn)) {
         if (strpos($open.$openMenuTabsLoggedIn, 'show_menu') === false) {
             if (api_is_anonymous()) {
-                $mainNavigation['navigation'][SECTION_CAMPUS]  = null;
+                $mainNavigation['navigation'][SECTION_CAMPUS] = null;
             }
         } else {
             if (api_get_user_id() && !api_is_anonymous()) {
@@ -462,7 +462,7 @@ 
                             'url' => $matches[1],
                             'target' => $matches[2],
                             'title' => $matches[3],
-                            'key' => 'page-' . str_replace(' ', '-', strtolower($matches[3]))
+                            'key' => 'page-'.str_replace(' ', '-', strtolower($matches[3]))
                         );
                     }
                 }
@@ -476,7 +476,7 @@ 
                             'url' => $matches[1],
                             'target' => $matches[2],
                             'title' => $matches[3],
-                            'key' => 'page-' . str_replace(' ', '-', strtolower($matches[3]))
+                            'key' => 'page-'.str_replace(' ', '-', strtolower($matches[3]))
                         );
                     }
                 }
@@ -489,7 +489,7 @@ 
         $activeSection = '';
         foreach ($mainNavigation['navigation'] as $section => $navigation_info) {
 
-            $key = (!empty($navigation_info['key'])?'tab-'.$navigation_info['key']:'');
+            $key = (!empty($navigation_info['key']) ? 'tab-'.$navigation_info['key'] : '');
 
             if (isset($GLOBALS['this_section'])) {
                 $tempSection = $section;
@@ -503,7 +503,7 @@ 
                 // loaded
                 if ($GLOBALS['this_section'] == SECTION_CAMPUS) {
                     if (!empty($_GET['include'])) {
-                        $name = str_replace(' ', '-', strtolower($navigation_info['title'])) . '_' . $lang . $ext;
+                        $name = str_replace(' ', '-', strtolower($navigation_info['title'])).'_'.$lang.$ext;
                         if (strtolower($_GET['include']) == $name) {
                             $activeSection = $section;
                         }
@@ -555,7 +555,7 @@ 
 
     if (!empty($_course) && !isset($_GET['hide_course_breadcrumb'])) {
 
-        $navigation_item['url'] = $web_course_path . $_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
+        $navigation_item['url'] = $web_course_path.$_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : '');
         $_course['name'] = api_htmlentities($_course['name']);
         $course_title = cut($_course['name'], MAX_LENGTH_BREADCRUMB);
 
@@ -570,7 +570,7 @@ 
                 $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
                 break;
             default:
-                if (api_get_session_id() != -1 ) {
+                if (api_get_session_id() != -1) {
                     $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name;
                 } else {
                     $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name']).' '.$course_title;
@@ -605,22 +605,22 @@ 
             // titles for shared folders
             if ($breadcrumb_step['name'] == 'shared_folder') {
                 $navigation_item['title'] = get_lang('UserFolders');
-            } elseif(strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
+            } elseif (strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
                 $navigation_item['title'] = get_lang('UserFolders');
-            } elseif(strstr($breadcrumb_step['name'], 'sf_user_')) {
+            } elseif (strstr($breadcrumb_step['name'], 'sf_user_')) {
                 $userinfo = api_get_user_info(substr($breadcrumb_step['name'], 8));
                 $navigation_item['title'] = $userinfo['complete_name'];
-            } elseif($breadcrumb_step['name'] == 'chat_files') {
+            } elseif ($breadcrumb_step['name'] == 'chat_files') {
                 $navigation_item['title'] = get_lang('ChatFiles');
-            } elseif($breadcrumb_step['name'] == 'images') {
+            } elseif ($breadcrumb_step['name'] == 'images') {
                 $navigation_item['title'] = get_lang('Images');
-            } elseif($breadcrumb_step['name'] == 'video') {
+            } elseif ($breadcrumb_step['name'] == 'video') {
                 $navigation_item['title'] = get_lang('Video');
-            } elseif($breadcrumb_step['name'] == 'audio') {
+            } elseif ($breadcrumb_step['name'] == 'audio') {
                 $navigation_item['title'] = get_lang('Audio');
-            } elseif($breadcrumb_step['name'] == 'flash') {
+            } elseif ($breadcrumb_step['name'] == 'flash') {
                 $navigation_item['title'] = get_lang('Flash');
-            } elseif($breadcrumb_step['name'] == 'gallery') {
+            } elseif ($breadcrumb_step['name'] == 'gallery') {
                 $navigation_item['title'] = get_lang('Gallery');
             }
             // Fixes breadcrumb title now we applied the Security::remove_XSS and
@@ -690,35 +690,35 @@ 
         if (!empty($final_navigation)) {
             // $home_link.= '<span class="divider">/</span>';
             if (!empty($home_link)) {
-                $lis.= Display::tag('li', $home_link);
+                $lis .= Display::tag('li', $home_link);
             }
 
             foreach ($final_navigation as $bread) {
                 $bread_check = trim(strip_tags($bread));
                 if (!empty($bread_check)) {
-                    if ($final_navigation_count-1 > $i) {
+                    if ($final_navigation_count - 1 > $i) {
                         $bread .= '';
                     }
-                    $lis.= Display::tag('li', $bread,array('class'=>'active'));
+                    $lis .= Display::tag('li', $bread, array('class'=>'active'));
                     $i++;
                 }
             }
         } else {
             if (!empty($home_link)) {
-                $lis.= Display::tag('li', $home_link);
+                $lis .= Display::tag('li', $home_link);
             }
         }
 
         // View as student/teacher link
         $view = null;
         if (!empty($view_as_student_link)) {
-            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
+            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link', 'class' => 'pull-right'));
         }
 
         if (!empty($navigation_right)) {
-            foreach($navigation_right as $item){
+            foreach ($navigation_right as $item) {
                 $extra_class = isset($item['class']) ? $item['class'] : null;
-                $lis.= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right'));
+                $lis .= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right'));
             }
         }
 
@@ -770,7 +770,7 @@ 
     if (!empty($_course['id'])) {
         if ($cacheEnabled) {
             $apc = apcu_cache_info(true);
-            $apc_end = $apc['start_time']+$apc['ttl'];
+            $apc_end = $apc['start_time'] + $apc['ttl'];
             if (apcu_exists('my_campus_whoisonline_count_simple_'.$_course['id']) &&
                 (time() < $apc_end) &&
                 apcu_fetch('my_campus_whoisonline_count_simple_'.$_course['id']) > 0
@@ -782,7 +782,7 @@ 
                     api_get_setting('time_limit_whosonline'),
                     $_course['id']
                 );
-                apcu_store('my_campus_whoisonline_count_simple_'.$_course['id'],$numberOnlineInCourse,15);
+                apcu_store('my_campus_whoisonline_count_simple_'.$_course['id'], $numberOnlineInCourse, 15);
             }
         } else {
             $numberOnlineInCourse = who_is_online_in_this_course_count(

main/inc/lib/CourseChatUtils.php

Doc Comments +2 added lines, -2 removed lines

@@ -1415,7 +1415,7 @@ 
 
     /**
      * Get the emoji list to include in chat
-     * @return array
+     * @return string[]
      */
     public static function getEmojisToInclude()
     {
@@ -1738,7 +1738,7 @@ 
 
     /**
      * Get the number of users connected in chat
-     * @return mixed
+     * @return integer
      */
     public function countUsersOnline()
     {

Spacing +65 added lines, -65 removed lines

@@ -62,7 +62,7 @@ 
             return '';
         }
 
-        Emojione\Emojione::$imagePathPNG = api_get_path(WEB_LIBRARY_PATH) . 'javascript/emojione/png/';
+        Emojione\Emojione::$imagePathPNG = api_get_path(WEB_LIBRARY_PATH).'javascript/emojione/png/';
         Emojione\Emojione::$ascii = true;
 
         $message = trim($message);
@@ -95,15 +95,15 @@ 
         $user = $em->find('ChamiloUserBundle:User', $this->userId);
         $courseInfo = api_get_course_info_by_id($this->courseId);
         $isMaster = (bool) api_is_course_admin();
-        $document_path = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
+        $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
         $basepath_chat = '/chat_files';
 
         if (!$this->groupId) {
             $group_info = GroupManager::get_group_properties($this->groupId);
-            $basepath_chat = $group_info['directory'] . '/chat_files';
+            $basepath_chat = $group_info['directory'].'/chat_files';
         }
 
-        $chat_path = $document_path . $basepath_chat . '/';
+        $chat_path = $document_path.$basepath_chat.'/';
 
         if (!is_dir($chat_path)) {
             if (is_file($chat_path)) {
@@ -113,25 +113,25 @@ 
 
         $date_now = date('Y-m-d');
         $timeNow = date('d/m/y H:i:s');
-        $basename_chat = 'messages-' . $date_now;
+        $basename_chat = 'messages-'.$date_now;
 
         if ($this->groupId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_gid-' . $this->groupId;
+            $basename_chat = 'messages-'.$date_now.'_gid-'.$this->groupId;
         } elseif ($this->sessionId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_sid-' . $this->sessionId;
+            $basename_chat = 'messages-'.$date_now.'_sid-'.$this->sessionId;
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $this->userId . '-' . $friendId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$this->userId.'-'.$friendId;
             } else {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $friendId . '-' . $this->userId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$friendId.'-'.$this->userId;
             }
         }
 
         $message = self::prepareMessage($message);
 
-        $fileTitle = $basename_chat . '.log.html';
-        $filePath = $basepath_chat . '/' . $fileTitle;
-        $absoluteFilePath = $chat_path . $fileTitle;
+        $fileTitle = $basename_chat.'.log.html';
+        $filePath = $basepath_chat.'/'.$fileTitle;
+        $absoluteFilePath = $chat_path.$fileTitle;
 
         if (!file_exists($absoluteFilePath)) {
             $doc_id = add_document($courseInfo, $filePath, 'file', 0, $fileTitle);
@@ -164,23 +164,23 @@ 
             $fileContent = '
                 <div class="message-teacher">
                     <div class="content-message">
-                        <div class="chat-message-block-name">' . $user->getCompleteName() . '</div>
-                        <div class="chat-message-block-content">' . $message . '</div>
-                        <div class="message-date">' . $timeNow . '</div>
+                        <div class="chat-message-block-name">' . $user->getCompleteName().'</div>
+                        <div class="chat-message-block-content">' . $message.'</div>
+                        <div class="message-date">' . $timeNow.'</div>
                     </div>
                     <div class="icon-message"></div>
-                    <img class="chat-image" src="' . $userPhoto . '">
+                    <img class="chat-image" src="' . $userPhoto.'">
                 </div>
             ';
         } else {
             $fileContent = '
                 <div class="message-student">
-                    <img class="chat-image" src="' . $userPhoto . '">
+                    <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-content">' . $message . '</div>
-                        <div class="message-date">' . $timeNow . '</div>
+                        <div class="chat-message-block-name">' . $user->getCompleteName().'</div>
+                        <div class="chat-message-block-content">' . $message.'</div>
+                        <div class="message-date">' . $timeNow.'</div>
                     </div>
                 </div>
             ';
@@ -275,9 +275,9 @@ 
         $extraCondition = null;
 
         if ($this->groupId) {
-            $extraCondition = 'AND ccc.toGroupId = ' . intval($this->groupId);
+            $extraCondition = 'AND ccc.toGroupId = '.intval($this->groupId);
         } else {
-            $extraCondition = 'AND ccc.sessionId = ' . intval($this->sessionId);
+            $extraCondition = 'AND ccc.sessionId = '.intval($this->sessionId);
         }
 
         $currentTime = new DateTime(api_get_utc_datetime(), new DateTimeZone('UTC'));
@@ -1413,7 +1413,7 @@ 
     {
         return [
             ':bowtie:',
-            ':smile:'|
+            ':smile:' |
             ':laughing:',
             ':blush:',
             ':smiley:',
@@ -1487,17 +1487,17 @@ 
     {
         $date = date('Y-m-d');
 
-        $base = 'messages-' . $date . '.log.html';
+        $base = 'messages-'.$date.'.log.html';
 
         if ($this->groupId && !$friendId) {
-            $base = 'messages-' . $date . '_gid-' . $this->groupId . '.log.html';
+            $base = 'messages-'.$date.'_gid-'.$this->groupId.'.log.html';
         } elseif ($this->sessionId && !$friendId) {
-            $base = 'messages-' . $date . '_sid-' . $this->sessionId . '.log.html';
+            $base = 'messages-'.$date.'_sid-'.$this->sessionId.'.log.html';
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $base = 'messages-' . $date . '_uid-' . $this->userId . '-' . $friendId . '.log.html';
+                $base = 'messages-'.$date.'_uid-'.$this->userId.'-'.$friendId.'.log.html';
             } else {
-                $base = 'messages-' . $date . '_uid-' . $friendId . '-' . $this->userId . '.log.html';
+                $base = 'messages-'.$date.'_uid-'.$friendId.'-'.$this->userId.'.log.html';
             }
         }
 
@@ -1506,16 +1506,16 @@ 
         }
 
         $courseInfo = api_get_course_info_by_id($this->courseId);
-        $document_path = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
+        $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
 
-        $chatPath = $document_path . '/chat_files/';
+        $chatPath = $document_path.'/chat_files/';
 
         if ($this->groupId) {
             $group_info = GroupManager::get_group_properties($this->groupId);
-            $chatPath = $document_path . $group_info['directory'] . '/chat_files/';
+            $chatPath = $document_path.$group_info['directory'].'/chat_files/';
         }
 
-        return $chatPath . $base;
+        return $chatPath.$base;
     }
 
     /**
@@ -1528,16 +1528,16 @@ 
     {
         $courseInfo = api_get_course_info_by_id($this->courseId);
         $date_now = date('Y-m-d');
-        $isMaster = (bool)api_is_course_admin();
+        $isMaster = (bool) api_is_course_admin();
         $basepath_chat = '/chat_files';
-        $document_path = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document';
+        $document_path = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document';
 
         if ($this->groupId) {
             $group_info = GroupManager:: get_group_properties($this->groupId);
-            $basepath_chat = $group_info['directory'] . '/chat_files';
+            $basepath_chat = $group_info['directory'].'/chat_files';
         }
 
-        $chat_path = $document_path . $basepath_chat . '/';
+        $chat_path = $document_path.$basepath_chat.'/';
 
         if (!is_dir($chat_path)) {
             if (is_file($chat_path)) {
@@ -1564,24 +1564,24 @@ 
             }
         }
 
-        $filename_chat = 'messages-' . $date_now . '.log.html';
+        $filename_chat = 'messages-'.$date_now.'.log.html';
 
         if ($this->groupId && !$friendId) {
-            $filename_chat = 'messages-' . $date_now . '_gid-' . $this->groupId . '.log.html';
+            $filename_chat = 'messages-'.$date_now.'_gid-'.$this->groupId.'.log.html';
         } else if ($this->sessionId && !$friendId) {
-            $filename_chat = 'messages-' . $date_now . '_sid-' . $this->sessionId . '.log.html';
+            $filename_chat = 'messages-'.$date_now.'_sid-'.$this->sessionId.'.log.html';
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $filename_chat = 'messages-' . $date_now . '_uid-' . $this->userId . '-' . $friendId . '.log.html';
+                $filename_chat = 'messages-'.$date_now.'_uid-'.$this->userId.'-'.$friendId.'.log.html';
             } else {
-                $filename_chat = 'messages-' . $date_now . '_uid-' . $friendId . '-' . $this->userId . '.log.html';
+                $filename_chat = 'messages-'.$date_now.'_uid-'.$friendId.'-'.$this->userId.'.log.html';
             }
         }
 
-        if (!file_exists($chat_path . $filename_chat)) {
-            @fclose(fopen($chat_path . $filename_chat, 'w'));
+        if (!file_exists($chat_path.$filename_chat)) {
+            @fclose(fopen($chat_path.$filename_chat, 'w'));
             if (!api_is_anonymous()) {
-                $doc_id = add_document($courseInfo, $basepath_chat . '/' . $filename_chat, 'file', 0, $filename_chat);
+                $doc_id = add_document($courseInfo, $basepath_chat.'/'.$filename_chat, 'file', 0, $filename_chat);
                 api_item_property_update(
                     $courseInfo,
                     TOOL_DOCUMENT,
@@ -1610,17 +1610,17 @@ 
             }
         }
 
-        $basename_chat = 'messages-' . $date_now;
+        $basename_chat = 'messages-'.$date_now;
 
         if ($this->groupId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_gid-' . $this->groupId;
+            $basename_chat = 'messages-'.$date_now.'_gid-'.$this->groupId;
         } else if ($this->sessionId && !$friendId) {
-            $basename_chat = 'messages-' . $date_now . '_sid-' . $this->sessionId;
+            $basename_chat = 'messages-'.$date_now.'_sid-'.$this->sessionId;
         } elseif ($friendId) {
             if ($this->userId < $friendId) {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $this->userId . '-' . $friendId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$this->userId.'-'.$friendId;
             } else {
-                $basename_chat = 'messages-' . $date_now . '_uid-' . $friendId . '-' . $this->userId;
+                $basename_chat = 'messages-'.$date_now.'_uid-'.$friendId.'-'.$this->userId;
             }
         }
 
@@ -1628,19 +1628,19 @@ 
 
             $i = 1;
 
-            while (file_exists($chat_path . $basename_chat . '-' . $i . '.log.html')) {
+            while (file_exists($chat_path.$basename_chat.'-'.$i.'.log.html')) {
                 $i++;
             }
 
-            @rename($chat_path . $basename_chat . '.log.html', $chat_path . $basename_chat . '-' . $i . '.log.html');
-            @fclose(fopen($chat_path . $basename_chat . '.log.html', 'w'));
+            @rename($chat_path.$basename_chat.'.log.html', $chat_path.$basename_chat.'-'.$i.'.log.html');
+            @fclose(fopen($chat_path.$basename_chat.'.log.html', 'w'));
 
             $doc_id = add_document(
                 $courseInfo,
-                $basepath_chat . '/' . $basename_chat . '-' . $i . '.log.html',
+                $basepath_chat.'/'.$basename_chat.'-'.$i.'.log.html',
                 'file',
-                filesize($chat_path . $basename_chat . '-' . $i . '.log.html'),
-                $basename_chat . '-' . $i . '.log.html'
+                filesize($chat_path.$basename_chat.'-'.$i.'.log.html'),
+                $basename_chat.'-'.$i.'.log.html'
             );
 
             api_item_property_update(
@@ -1671,7 +1671,7 @@ 
 
             $doc_id = DocumentManager::get_document_id(
                 $courseInfo,
-                $basepath_chat . '/' . $basename_chat . '.log.html'
+                $basepath_chat.'/'.$basename_chat.'.log.html'
             );
 
             update_existing_document($courseInfo, $doc_id, 0);
@@ -1680,8 +1680,8 @@ 
         $remove = 0;
         $content = array();
 
-        if (file_exists($chat_path . $basename_chat . '.log.html')) {
-            $content = file($chat_path . $basename_chat . '.log.html');
+        if (file_exists($chat_path.$basename_chat.'.log.html')) {
+            $content = file($chat_path.$basename_chat.'.log.html');
             $nbr_lines = sizeof($content);
             $remove = $nbr_lines - 100;
         }
@@ -1694,7 +1694,7 @@ 
 
         if (isset($_GET['origin']) && $_GET['origin'] == 'whoisonline') {
             //the caller
-            $content[0] = get_lang('CallSent') . '<br />' . $content[0];
+            $content[0] = get_lang('CallSent').'<br />'.$content[0];
         }
         if (isset($_GET['origin']) && $_GET['origin'] == 'whoisonlinejoin') {
             //the joiner (we have to delete the chat request to him when he joins the chat)
@@ -1719,7 +1719,7 @@ 
             $history .= '
                 <div id="clear-chat">
                     <button type="button" id="chat-reset" class="btn btn-danger btn-sm">
-                        ' . get_lang('ClearList') . '
+                        ' . get_lang('ClearList').'
                     </button>
                 </div>
             ';
@@ -1740,9 +1740,9 @@ 
         $extraCondition = null;
 
         if ($this->groupId) {
-            $extraCondition = 'AND ccc.toGroupId = ' . intval($this->groupId);
+            $extraCondition = 'AND ccc.toGroupId = '.intval($this->groupId);
         } else {
-            $extraCondition = 'AND ccc.sessionId = ' . intval($this->sessionId);
+            $extraCondition = 'AND ccc.sessionId = '.intval($this->sessionId);
         }
 
         $number = Database::getManager()
@@ -1772,9 +1772,9 @@ 
         $extraCondition = null;
 
         if ($this->groupId) {
-            $extraCondition = 'AND ccc.toGroupId = ' . intval($this->groupId);
+            $extraCondition = 'AND ccc.toGroupId = '.intval($this->groupId);
         } else {
-            $extraCondition = 'AND ccc.sessionId = ' . intval($this->sessionId);
+            $extraCondition = 'AND ccc.sessionId = '.intval($this->sessionId);
         }
 
         $number = Database::getManager()
@@ -1810,7 +1810,7 @@ 
                 'lastname' => $user->getLastname(),
                 'status' => !$this->sessionId ? $subscription->getStatus() : $user->getStatus(),
                 'image_url' => UserManager::getUserPicture($user->getId(), USER_IMAGE_SIZE_MEDIUM),
-                'profile_url' => api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $user->getId(),
+                'profile_url' => api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user->getId(),
                 'complete_name' => $user->getCompleteName(),
                 'username' => $user->getUsername(),
                 'email' => $user->getEmail(),

main/chat/chat.php

Spacing +4 added lines, -4 removed lines

@@ -17,11 +17,11 @@ 
 ];
 
 foreach ($externalCSS as $css) {
-    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH) . $css);
+    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH).$css);
 }
 
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'chat.css');
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'markdown.css');
+$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'chat.css');
+$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH).'markdown.css');
 
 $externalJS = [
     'highlight/highlight.pack.js',
@@ -41,7 +41,7 @@ 
         continue;
     }
 
-    $iconList[$key] = strtoupper($icon) . '.png';
+    $iconList[$key] = strtoupper($icon).'.png';
 }
 
 $view = new Template(get_lang('Chat'), false, false, false, true, false);

main/extrafield/translate.php

Spacing +7 added lines, -7 removed lines

@@ -16,12 +16,12 @@ 
 
 if (isset($_GET['extra_field'])) {
     $extraField = $em->find('ChamiloCoreBundle:ExtraField', intval($_GET['extra_field']));
-    $variableLanguage = '$' . api_underscore_to_camel_case($extraField->getVariable());
+    $variableLanguage = '$'.api_underscore_to_camel_case($extraField->getVariable());
     $originalName = $extraField->getDisplayText(false);
 } elseif (isset($_GET['extra_field_option'])) {
     $extraFieldOption = $em->find('ChamiloCoreBundle:ExtraFieldOptions', intval($_GET['extra_field_option']));
     $extraField = $extraFieldOption->getField();
-    $variableLanguage = '$' . ExtraFieldOption::getLanguageVariable($extraFieldOption->getDisplayText());
+    $variableLanguage = '$'.ExtraFieldOption::getLanguageVariable($extraFieldOption->getDisplayText());
     $originalName = $extraFieldOption->getDisplayText(false);
 }
 
@@ -41,7 +41,7 @@ 
     $languagesOptions[$language->getId()] = $language->getOriginalName();
 }
 
-$translateUrl = api_get_path(WEB_CODE_PATH) . 'admin/sub_language_ajax.inc.php';
+$translateUrl = api_get_path(WEB_CODE_PATH).'admin/sub_language_ajax.inc.php';
 
 $form = new FormValidator('new_lang_variable', 'POST', $translateUrl);
 $form->addHeader(get_lang('AddWordForTheSubLanguage'));
@@ -70,24 +70,24 @@ 
 $form->addRule('sub_language', get_lang('Required'), 'required');
 $form->freeze(['variable_language', 'original_name']);
 
-$interbreadcrumb[] = ['url' => api_get_path(WEB_CODE_PATH) . 'admin', 'name' => get_lang('Administration')];
+$interbreadcrumb[] = ['url' => api_get_path(WEB_CODE_PATH).'admin', 'name' => get_lang('Administration')];
 
 switch ($extraField->getExtraFieldType()) {
     case \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE:
         $interbreadcrumb[] = [
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=user',
+            'url' => api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=user',
             'name' => get_lang('UserFields')
         ];
         break;
     case \Chamilo\CoreBundle\Entity\ExtraField::COURSE_FIELD_TYPE:
         $interbreadcrumb[] = [
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=course',
+            'url' => api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=course',
             'name' => get_lang('CourseFields')
         ];
         break;
     case \Chamilo\CoreBundle\Entity\ExtraField::SESSION_FIELD_TYPE:
         $interbreadcrumb[] = [
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=session',
+            'url' => api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=session',
             'name' => get_lang('SessionFields')
         ];
         break;

main/admin/sub_language_ajax.inc.php

Spacing +8 added lines, -8 removed lines

@@ -9,9 +9,9 @@ 
 
 api_protect_admin_script();
 
-$new_language        = Security::remove_XSS($_REQUEST['new_language']);
-$language_variable    = Security::remove_XSS($_REQUEST['variable_language']);
-$file_id            = intval($_REQUEST['file_id']);
+$new_language = Security::remove_XSS($_REQUEST['new_language']);
+$language_variable = Security::remove_XSS($_REQUEST['variable_language']);
+$file_id = intval($_REQUEST['file_id']);
 /**
  * Code
  */
@@ -27,10 +27,10 @@ 
 
     //update variable language
     // Replace double quotes to avoid parse errors
-    $new_language = str_replace('"', '\"',$new_language);
+    $new_language = str_replace('"', '\"', $new_language);
     // Replace new line signs to avoid parse errors - see #6773
-    $new_language = str_replace("\n","\\n",$new_language);
-    $all_file_of_directory[$language_variable]="\"".$new_language."\";";
+    $new_language = str_replace("\n", "\\n", $new_language);
+    $all_file_of_directory[$language_variable] = "\"".$new_language."\";";
     $result_array = array();
 
     foreach ($all_file_of_directory as $key_value=>$value_info) {
@@ -40,7 +40,7 @@ 
     if (!empty($result_array)) {
         foreach ($result_array as $key => $result) {
             if ($result == false) {
-                $variables_with_problems .=$key.' <br />';
+                $variables_with_problems .= $key.' <br />';
             }
         }
     }
@@ -50,7 +50,7 @@ 
             Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success')
         );
 
-        $redirectUrl = api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=';
+        $redirectUrl = api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=';
 
         switch ($_REQUEST['extra_field_type']) {
             case \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE:

main/inc/lib/extra_field.lib.php

Spacing +42 added lines, -42 removed lines

@@ -26,19 +26,19 @@ 
     );
 
     public $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -343,7 +343,7 @@ 
      */
     public static function get_extra_fields_by_handler($handler)
     {
-        $types= array();
+        $types = array();
         $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
         $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
         $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
@@ -1027,7 +1027,7 @@ 
                         // chzn-select doesn't work for sessions??
                         $form->addElement(
                             'select',
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             $field_details['display_text'],
                             $options,
                             array('id' => 'extra_'.$field_details['variable'])
@@ -1086,7 +1086,7 @@ 
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
-                                $form->freeze('extra_' . $field_details['variable']);
+                                $form->freeze('extra_'.$field_details['variable']);
                             }
                         }
                         break;
@@ -1163,7 +1163,7 @@ 
                             }
                         });';
 
-                        $first_id  = null;
+                        $first_id = null;
                         if (!empty($extraData)) {
                             if (isset($extraData['extra_'.$field_details['variable']])) {
                                 $first_id = $extraData['extra_'.$field_details['variable']]['extra_'.$field_details['variable']];
@@ -1424,9 +1424,9 @@ 
 
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
 
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::img(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     $field_details['display_text'],
                                     ['width' => '300']
                                 );
@@ -1450,7 +1450,7 @@ 
                         $allowed_picture_types = ['jpg', 'jpeg', 'png', 'gif'];
                         $form->addRule(
                             'extra_'.$field_details['variable'],
-                            get_lang('OnlyImagesAllowed') . ' ('.implode(',', $allowed_picture_types).')',
+                            get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
                             'filetype',
                             $allowed_picture_types
                         );
@@ -1492,10 +1492,10 @@ 
                         if (is_array($extraData) &&
                             array_key_exists($fieldVariable, $extraData)
                         ) {
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::url(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     array(
                                         'title' => $field_details['display_text'],
                                         'target' => '_blank'
@@ -1535,12 +1535,12 @@ 
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1551,13 +1551,13 @@ 
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1567,12 +1567,12 @@ 
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1583,13 +1583,13 @@ 
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1618,7 +1618,7 @@ 
                             '<script>
                                 $(document).ready(function() {
 
-                                    var address = "' . $dataValue . '";
+                                    var address = "' . $dataValue.'";
                                     initializeGeo'.$field_details['variable'].'(address, false);
 
                                     $("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
@@ -1650,7 +1650,7 @@ 
                                         };
 
                                         var geoError = function(error) {
-                                            alert("Geocode ' . get_lang('Error') . ': " + error);
+                                            alert("Geocode ' . get_lang('Error').': " + error);
                                         };
 
                                         var geoOptions = {
@@ -1701,11 +1701,11 @@ 
                                                         infowindow.open(map_'.$field_details['variable'].', marker);
                                                     });
                                                 } else {
-                                                    alert("' . get_lang("NotFound") . '");
+                                                    alert("' . get_lang("NotFound").'");
                                                 }
 
                                             } else {
-                                                alert("Geocode ' . get_lang('Error') . ': " + status);
+                                                alert("Geocode ' . get_lang('Error').': " + status);
                                             }
                                         });
                                     }
@@ -1893,7 +1893,7 @@ 
         $form->addElement('header', $header);
 
         if ($action == 'edit') {
-            $translateUrl = api_get_path(WEB_CODE_PATH) . 'extrafield/translate.php?' . http_build_query([
+            $translateUrl = api_get_path(WEB_CODE_PATH).'extrafield/translate.php?'.http_build_query([
                 'extra_field' => $id
             ]);
             $translateButton = Display::toolbarButton(get_lang('TranslateThisTerm'), $translateUrl, 'language', 'link');
@@ -2224,7 +2224,7 @@ 
                 foreach ($extra_fields as $extra_info) {
                     $extra_field_info = $extra_info['extra_field_info'];
                     $inject_joins .= " INNER JOIN $this->table_field_values fv$counter
-                                       ON (s." . $this->primaryKey . " = fv$counter." . $this->handler_id . ") ";
+                                       ON (s.".$this->primaryKey." = fv$counter.".$this->handler_id.") ";
                     // Add options
                     if (isset($extra_field_info['field_type']) && in_array(
                             $extra_field_info['field_type'],
@@ -2237,7 +2237,7 @@ 
                     ) {
                         $options['where'] = str_replace(
                             $extra_info['field'],
-                            'fv' . $counter . '.field_id = ' . $extra_info['id'] . ' AND fvo' . $counter . '.option_value',
+                            'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fvo'.$counter.'.option_value',
                             $options['where']
                         );
                         $inject_joins .= "
@@ -2252,13 +2252,13 @@ 
                     ) {
                         $options['where'] = str_replace(
                             $extra_info['field'],
-                            'tag' . $counter . '.tag ',
+                            'tag'.$counter.'.tag ',
                             $options['where']
                         );
 
                         $inject_joins .= "
                             INNER JOIN $this->table_field_rel_tag tag_rel$counter
-                            ON (tag_rel$counter.field_id = ".$extra_info['id']." AND tag_rel$counter.item_id = s." . $this->primaryKey.")
+                            ON (tag_rel$counter.field_id = ".$extra_info['id']." AND tag_rel$counter.item_id = s.".$this->primaryKey.")
                             INNER JOIN $this->table_field_tag tag$counter
                             ON (tag$counter.id =  tag_rel$counter.tag_id)
                         ";
@@ -2463,19 +2463,19 @@ 
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $image = Display::img(
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         $field['display_text'],
                         array('width' => '300')
                     );
 
                     $displayedValue = Display::url(
                         $image,
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array('target' => '_blank')
                     );
                     break;
@@ -2484,13 +2484,13 @@ 
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $displayedValue = Display::url(
                         get_lang('Download'),
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array(
                             'title' => $field['display_text'],
                             'target' => '_blank'

Doc Comments +7 added lines, -7 removed lines

@@ -140,7 +140,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getValidExtraFieldTypes()
     {
@@ -217,7 +217,7 @@ 
 
     /**
      * @param array $conditions
-     * @param null  $order_field_options_by
+     * @param string  $order_field_options_by
      *
      * @return array
      */
@@ -375,7 +375,7 @@ 
     /**
      * @param string $handler
      *
-     * @return array
+     * @return string[]
      */
     public static function get_extra_fields_by_handler($handler)
     {
@@ -574,7 +574,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function get_field_types()
     {
@@ -584,7 +584,7 @@ 
     /**
      * @param int $id
      *
-     * @return null
+     * @return string|null
      */
     public function get_field_type_by_id($id)
     {
@@ -1826,7 +1826,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getJqgridColumnNames()
     {
@@ -2086,7 +2086,7 @@ 
     }
 
     /**
-     * @param array $columns
+     * @param string[] $columns
      * @param array  $column_model
      * @param array  $extraFields
      * @return array

Indentation +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
         'changeable',
         'filter',
         'extra_field_type',
-         /* Enable this when field_loggeable is introduced as a table field (2.0)
+            /* Enable this when field_loggeable is introduced as a table field (2.0)
         'field_loggeable',
          */
         'created_at'
@@ -812,7 +812,7 @@ 
                 foreach ($orderFields as $order) {
                     foreach ($extra as $field_details) {
                         if ($order == $field_details['variable']) {
-                           $newOrder[] = $field_details;
+                            $newOrder[] = $field_details;
                         }
                     }
                 }
@@ -1883,7 +1883,7 @@ 
                 'align' => 'left',
                 'sortable' => 'true',
             ),
-             array(
+                array(
                 'name' => 'visible_to_others',
                 'index' => 'visible_to_others',
                 'width' => '40',

main/auth/courses_controller.php

Spacing +17 added lines, -18 removed lines

@@ -62,7 +62,7 @@ 
      * @param string   $message confirmation message(optional)
      * @param string   $error error message(optional)
      */
-    public function categories_list($action, $message='', $error='')
+    public function categories_list($action, $message = '', $error = '')
     {
         $data = array();
         $data['user_course_categories'] = $this->model->get_user_course_categories();
@@ -393,13 +393,13 @@ 
                     $html .= '</strong>';
                 } else {
                     if (!empty($categoryCourses)) {
-                        $html .= '<a href="' . CourseCategory::getCourseCategoryUrl(
+                        $html .= '<a href="'.CourseCategory::getCourseCategoryUrl(
                                 1,
                                 $limit['length'],
                                 $categoryCode,
                                 $hiddenLinks,
                                 $action
-                            ) . '">';
+                            ).'">';
                         $html .= "$categoryName ($categoryCourses)";
                         $html .= '</a>';
                     } else {
@@ -420,13 +420,13 @@ 
                         if ($code == $subCategory1Code) {
                             $html .= "<strong>$subCategory1Name ($subCategory1Courses)</strong>";
                         } else {
-                            $html .= '<a href="' . CourseCategory::getCourseCategoryUrl(
+                            $html .= '<a href="'.CourseCategory::getCourseCategoryUrl(
                                     1,
                                     $limit['length'],
                                     $categoryCode,
                                     $hiddenLinks,
                                     $action
-                                ) . '">';
+                                ).'">';
                             $html .= "$subCategory1Name ($subCategory1Courses)";
                             $html .= '</a>';
                         }
@@ -444,13 +444,13 @@ 
                                 if ($code == $subCategory2Code) {
                                     $html .= "<strong>$subCategory2Name ($subCategory2Courses)</strong>";
                                 } else {
-                                    $html .= '<a href="' . CourseCategory::getCourseCategoryUrl(
+                                    $html .= '<a href="'.CourseCategory::getCourseCategoryUrl(
                                             1,
                                             $limit['length'],
                                             $categoryCode,
                                             $hiddenLinks,
                                             $action
-                                        ) . '">';
+                                        ).'">';
                                     $html .= "$subCategory2Name ($subCategory2Courses)";
                                     $html .= '</a>';
                                 }
@@ -468,13 +468,13 @@ 
                                         if ($code == $subCategory3Code) {
                                             $html .= "<strong>$subCategory3Name ($subCategory3Courses)</strong>";
                                         } else {
-                                            $html .= '<a href="' . CourseCategory::getCourseCategoryUrl(
+                                            $html .= '<a href="'.CourseCategory::getCourseCategoryUrl(
                                                     1,
                                                     $limit['length'],
                                                     $categoryCode,
                                                     $hiddenLinks,
                                                     $action
-                                                ) . '">';
+                                                ).'">';
                                             $html .= "$subCategory3Name ($subCategory3Courses)";
                                             $html .= '</a>';
                                         }
@@ -615,7 +615,7 @@ 
      */
     public function getSessionIcon($sessionName)
     {
-        return Display::return_icon('window_list.png', $sessionName, null,ICON_SIZE_MEDIUM);
+        return Display::return_icon('window_list.png', $sessionName, null, ICON_SIZE_MEDIUM);
     }
 
     /**
@@ -636,8 +636,7 @@ 
         $pageTotal = intval(ceil(intval($countSessions) / $limit['length']));
         // Do NOT show pagination if only one page or less
         $cataloguePagination = $pageTotal > 1 ?
-            CourseCategory::getCatalogPagination($limit['current'], $limit['length'], $pageTotal) :
-            '';
+            CourseCategory::getCatalogPagination($limit['current'], $limit['length'], $pageTotal) : '';
         $sessionsBlocks = $this->getFormatedSessionsBlock($sessions);
 
         // Get session list catalogue URL
@@ -648,13 +647,13 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('catalog_pagination', $cataloguePagination);
         $tpl->assign('hidden_links', $hiddenLinks);
         $tpl->assign('search_token', Security::get_token());
         $tpl->assign('search_date', $date);
-        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH) . 'course.ajax.php');
+        $tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH).'course.ajax.php');
         $tpl->assign('sessions', $sessionsBlocks);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
 
@@ -681,7 +680,7 @@ 
 
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);
@@ -712,7 +711,7 @@ 
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);
@@ -810,7 +809,7 @@ 
             $coachName = $session->getGeneralCoach()->getCompleteName();
             $actions = null;
             if (api_is_platform_admin()) {
-                $actions = api_get_path(WEB_CODE_PATH) .'session/resume_session.php?id_session='.$session->getId();
+                $actions = api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$session->getId();
             }
 
             $isThisSessionOnSale = $session->getBuyCoursePluginPrice();
@@ -822,7 +821,7 @@ 
                 'nbr_courses' => $session->getNbrCourses(),
                 'nbr_users' => $session->getNbrUsers(),
                 'coach_id' => $coachId,
-                'coach_url' => api_get_path(WEB_AJAX_PATH) . 'user_manager.ajax.php?a=get_user_popup&user_id=' . $coachId,
+                'coach_url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId,
                 'coach_name' => $coachName,
                 'coach_avatar' => UserManager::getUserPicture($coachId, USER_IMAGE_SIZE_SMALL),
                 'is_subscribed' => SessionManager::isUserSubscribedAsStudent($session->getId(), $userId),

main/inc/lib/glossary.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
      *
      * @param array  $values  Array of title + description (name => $title, description => $comment)
      *
-     * @return mixed   Term id on success, false on failure
+     * @return false|string   Term id on success, false on failure
      *
      */
     public static function save_glossary($values, $showMessage = true)
@@ -448,7 +448,7 @@ 
 
     /**
      * Display the glossary terms in a list
-     * @return bool true
+     * @return string true
      */
     public static function displayGlossaryList()
     {
@@ -585,7 +585,7 @@ 
      * Update action icons column
      *
      * @param integer $glossary_id
-     * @param array   $url_params Parameters to use to affect links
+     * @param string   $url_params Parameters to use to affect links
      * @param array   $row The line of results from a query on the glossary table
      *
      * @return string HTML string for the action icons columns

Spacing +18 added lines, -18 removed lines

@@ -47,9 +47,9 @@ 
      *
      * @return string The glossary description
      */
-    public static function get_glossary_term_by_glossary_id ($glossary_id)
+    public static function get_glossary_term_by_glossary_id($glossary_id)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $course_id = api_get_course_int_id();
         $sql = "SELECT description FROM $glossary_table
                 WHERE c_id = $course_id  AND glossary_id =".intval($glossary_id);
@@ -72,7 +72,7 @@ 
      */
     public static function get_glossary_term_by_glossary_name($glossary_name)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
         $sql_filter = api_get_session_condition($session_id);
@@ -225,7 +225,7 @@ 
         $get_max = "SELECT MAX(display_order) FROM $t_glossary
                     WHERE c_id = $course_id ";
         $res_max = Database::query($get_max);
-        if (Database::num_rows($res_max)==0) {
+        if (Database::num_rows($res_max) == 0) {
             return 0;
         }
         $row = Database::fetch_array($res_max);
@@ -254,7 +254,7 @@ 
                 WHERE
                     c_id = $course_id AND
                     name = '".Database::escape_string($term)."'";
-        if ($not_id<>'') {
+        if ($not_id <> '') {
             $sql .= " AND glossary_id <> '".intval($not_id)."'";
         }
         $result = Database::query($sql);
@@ -378,25 +378,25 @@ 
         $actionsLeft = '';
         if (api_is_allowed_to_edit(null, true)) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add?'.api_get_cidreq().'">'.
-                Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_glossary_term.png', get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export">'.
-            Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('export_csv.png', get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
         if (api_is_allowed_to_edit(null, true)) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=import">'.
-                Display::return_icon('import_csv.png',get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
-            Display::return_icon('pdf.png',get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
         if (($view == 'table') || (!isset($view))) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
-                Display::return_icon('view_detailed.png',get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_detailed.png', get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
         } else {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=table">'.
-                Display::return_icon('view_text.png',get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_text.png', get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         /* BUILD SEARCH FORM */
@@ -433,7 +433,7 @@ 
             $table->set_header(1, get_lang('TermDefinition'), true);
             if (api_is_allowed_to_edit(null, true)) {
                 $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
-                $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
+                $table->set_column_filter(2, array('GlossaryManager', 'actions_filter'));
             }
             $content .= $table->return_table();
         }
@@ -455,8 +455,8 @@ 
         $content = '';
         foreach ($glossary_data as $key => $glossary_item) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true)) {
-                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
+            if (api_is_allowed_to_edit(null, true)) {
+                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '', $glossary_item).'</div>';
             }
             $content .= Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
         }
@@ -469,7 +469,7 @@ 
      * @return integer Count of glossary terms
      *
      */
-    public static function get_number_glossary_terms($session_id=0)
+    public static function get_number_glossary_terms($session_id = 0)
     {
         // Database table definition
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -563,7 +563,7 @@ 
         while ($data = Database::fetch_array($res)) {
             // Validation when belongs to a session
             $session_img = api_get_session_image($data['session_id'], $_user['status']);
-            $array[0] = $data[0] . $session_img;
+            $array[0] = $data[0].$session_img;
 
             if (!$view || $view === 'table') {
                 $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
@@ -593,13 +593,13 @@ 
     {
         $glossary_id = $row[2];
         $return = '<a href="'.api_get_self().'?action=edit_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.
-            Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
+            Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
         $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
         $glossary_term = $glossary_data['name'];
         if (api_is_allowed_to_edit(null, true)) {
             if ($glossary_data['session_id'] == api_get_session_id()) {
                 $return .= '<a href="'.api_get_self().'?action=delete_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.
-                    Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
+                    Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a>';
             } else {
                 $return = get_lang('EditionNotAvailableFromSession');
             }

main/glossary/index.php

Indentation +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
                     api_get_local_time($glossary_data['update_date'])
                 );
             } else {
-                 $glossary_data['update_date'] = '';
+                    $glossary_data['update_date'] = '';
             }
 
             $form->addLabel(get_lang('CreationDate'), $glossary_data['insert_date']);

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
         if (!api_is_allowed_to_edit(null, true)) {
             api_not_allowed(true);
         }
-        $tool_name =  get_lang('Add');
+        $tool_name = get_lang('Add');
         $form = new FormValidator(
             'glossary',
             'post',
@@ -190,7 +190,7 @@ 
         if (!api_is_allowed_to_edit(null, true)) {
             api_not_allowed(true);
         }
-        $tool_name =  get_lang('ImportGlossary');
+        $tool_name = get_lang('ImportGlossary');
         $form = new FormValidator(
             'glossary',
             'post',
@@ -218,7 +218,7 @@ 
                 foreach (GlossaryManager::get_glossary_terms() as $term) {
                     if (!GlossaryManager::delete_glossary($term['id'], false)) {
                         Display::addFlash(
-                            Display::return_message(get_lang("CannotDeleteGlossary") . ':' . $term['id'], 'error')
+                            Display::return_message(get_lang("CannotDeleteGlossary").':'.$term['id'], 'error')
                         );
                     } else {
                         $termsDeleted[] = $term['name'];
@@ -315,7 +315,7 @@ 
             if (count($badList) > 0) {
                 Display::addFlash(
                     Display::return_message(
-                        get_lang("GlossaryTermAlreadyExists").': ' . implode(', ', $badList),
+                        get_lang("GlossaryTermAlreadyExists").': '.implode(', ', $badList),
                         'error'
                     )
                 );
@@ -358,7 +358,7 @@ 
         GlossaryManager::export_to_pdf();
         break;
     case 'changeview':
-        if (in_array($_GET['view'], array('list','table'))) {
+        if (in_array($_GET['view'], array('list', 'table'))) {
             Session::write('glossary_view', $_GET['view']);
         } else {
             $view = Session::read('glossary_view');