chamilo / chamilo-lms

main/inc/lib/add_many_session_to_category_functions.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      * Search for a session based on a given search string
      * @param string A search string
      * @param string A search box type (single or anything else)
-     * @return string XajaxResponse
+     * @return xajaxResponse XajaxResponse
      * @assert () !== ''
      * @assert ('abc','single') !== ''
      */

Spacing +5 added lines, -5 removed lines

@@ -21,12 +21,12 @@ 
      * @assert () !== ''
      * @assert ('abc','single') !== ''
      */
-    function search_courses($needle,$type)
+    function search_courses($needle, $type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 		$xajax_response = new xajaxResponse();
 		$return = '';
-		if(!empty($needle) && !empty($type)) {
+		if (!empty($needle) && !empty($type)) {
 			// xajax send utf8 datas... datas in db can be non-utf8 datas
 			$charset = api_get_system_encoding();
 			$needle = api_convert_encoding($needle, $charset, 'utf-8');
@@ -38,12 +38,12 @@ 
 			$course_list = array();
 
 			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
+			while ($course = Database :: fetch_array($rs)) {
 				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'], ENT_QUOTES).'">'.$course['name'].'</option>';
 			}
 			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+			$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 		}
 		$_SESSION['course_list'] = $course_list;
 		return $xajax_response;

Indentation +21 added lines, -21 removed lines

@@ -24,28 +24,28 @@
     function search_courses($needle,$type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-		$xajax_response = new xajaxResponse();
-		$return = '';
-		if(!empty($needle) && !empty($type)) {
-			// xajax send utf8 datas... datas in db can be non-utf8 datas
-			$charset = api_get_system_encoding();
-			$needle = api_convert_encoding($needle, $charset, 'utf-8');
-			$needle = Database::escape_string($needle);
+        $xajax_response = new xajaxResponse();
+        $return = '';
+        if(!empty($needle) && !empty($type)) {
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
+            $needle = Database::escape_string($needle);
 
-			$sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
+            $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
 
-			$rs = Database::query($sql);
-			$course_list = array();
+            $rs = Database::query($sql);
+            $course_list = array();
 
-			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
-				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
-			}
-			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-		}
-		$_SESSION['course_list'] = $course_list;
-		return $xajax_response;
-	}
+            $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
+            while($course = Database :: fetch_array($rs)) {
+                $course_list[] = $course['id'];
+                $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+            }
+            $return .= '</select>';
+            $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+        }
+        $_SESSION['course_list'] = $course_list;
+        return $xajax_response;
+    }
 }

main/inc/lib/AnnouncementEmail.php

Doc Comments +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     /**
      *
      * @param int|array $course
-     * @param int|array $annoucement
+     * @param integer $announcement
      *
      * @return AnnouncementEmail
      */
@@ -50,7 +50,7 @@ 
      *
      * @param string $key
      *
-     * @return array
+     * @return string|null
      */
     public function course($key = '')
     {

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
      *
      * @return array
      */
-    public function sender($key = '',  $userId = '')
+    public function sender($key = '', $userId = '')
     {
         $_user = api_get_user_info($userId);
 

main/inc/lib/AnnouncementManager.php

Doc Comments +9 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_tags()
     {
@@ -40,7 +40,7 @@ 
      * @param string    $course_code
      * @param int       $session_id
      *
-     * @return mixed
+     * @return string
      */
     public static function parse_content($userId, $content, $course_code, $session_id = 0)
     {
@@ -349,7 +349,7 @@ 
      * @param array	    uploaded file $_FILES
      * @param string    Comment describing the attachment
      * @param bool  $sendToUsersInSession
-     * @return int      false on failure, ID of the announcement on success
+     * @return false|string      false on failure, ID of the announcement on success
      */
     public static function add_announcement(
         $emailTitle,
@@ -460,7 +460,7 @@ 
      * @param $to_users
      * @param array $file
      * @param string $file_comment
-     * @return bool|int
+     * @return false|string
      */
     public static function add_group_announcement(
         $emailTitle,
@@ -699,7 +699,7 @@ 
 
     /**
      * @param int $insert_id
-     * @return bool
+     * @return false|null
      */
     public static function update_mail_sent($insert_id)
     {
@@ -719,6 +719,7 @@ 
      * Gets all announcements from a user by course
      * @param	string course db
      * @param	int user id
+     * @param integer $user_id
      * @return	array html with the content and count of announcements or false otherwise
      */
     public static function get_all_annoucement_by_user_course($course_code, $user_id)
@@ -1184,6 +1185,7 @@ 
      * has been sent to
      * @param    string  The tool (announcement, agenda, ...)
      * @param    int     ID of the element of the corresponding type
+     * @param string $tool
      * @return   array   Array of users and groups to whom the element has been sent
      */
     public static function sent_to($tool, $id)
@@ -1308,6 +1310,8 @@ 
      * @param int attach id
      * @param array uploaded file $_FILES
      * @param string file comment
+     * @param integer $id_attach
+     * @param string $file_comment
      * @return int
      */
     public static function edit_announcement_attachment_file($id_attach, $file, $file_comment)

Indentation +1 added lines, -1 removed lines

@@ -1510,7 +1510,7 @@
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships)."))
                         ) ";
                     } else {
-                       $cond_user_id = " AND (
+                        $cond_user_id = " AND (
                             ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".api_get_group_id()."))
                         )";
                     }

Spacing +73 added lines, -73 removed lines

@@ -216,8 +216,8 @@ 
                             announcement.id = '$announcement_id' AND
                             toolitemproperties.tool='announcement' AND
                             (
-                                toolitemproperties.to_user_id='" . api_get_user_id() . "' OR
-                                toolitemproperties.to_group_id IN ('0', '" . implode("', '", $group_list) . "') OR
+                                toolitemproperties.to_user_id='".api_get_user_id()."' OR
+                                toolitemproperties.to_group_id IN ('0', '" . implode("', '", $group_list)."') OR
                                 toolitemproperties.to_group_id IS NULL
                             ) AND
                             toolitemproperties.visibility='1' AND
@@ -246,13 +246,13 @@ 
             $title = $result['title'];
             $content = $result['content'];
             $html .= "<table height=\"100\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\" class=\"data_table\">";
-            $html .= "<tr><td><h2>" . $title . "</h2></td></tr>";
+            $html .= "<tr><td><h2>".$title."</h2></td></tr>";
 
             if (api_is_allowed_to_edit(false, true) ||
                 (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
             ) {
-                $modify_icons = "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=modify&id=" . $announcement_id . "\">" .
-                    Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>";
+                $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$announcement_id."\">".
+                    Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
                 if ($result['visibility'] == 1) {
                     $image_visibility = "visible";
                     $alt_visibility = get_lang('Hide');
@@ -262,12 +262,12 @@ 
                 }
                 global $stok;
 
-                $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&origin=" . (!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '') . "&action=showhide&id=" . $announcement_id . "&sec_token=" . $stok . "\">" .
-                    Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>";
+                $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".(!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '')."&action=showhide&id=".$announcement_id."&sec_token=".$stok."\">".
+                    Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>";
 
                 if (api_is_allowed_to_edit(false, true)) {
-                    $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=delete&id=" . $announcement_id . "&sec_token=" . $stok . "\" onclick=\"javascript:if(!confirm('" . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)) . "')) return false;\">" .
-                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) .
+                    $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$announcement_id."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."')) return false;\">".
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
                         "</a>";
                 }
                 $html .= "<tr><th style='text-align:right'>$modify_icons</th></tr>";
@@ -276,7 +276,7 @@ 
             $content = self::parse_content($result['to_user_id'], $content, api_get_course_id(), api_get_session_id());
 
             $html .= "<tr><td>$content</td></tr>";
-            $html .= "<tr><td class=\"announcements_datum\">" . get_lang('LastUpdateDate') . " : " . api_convert_and_format_date($result['insert_date'], DATE_TIME_FORMAT_LONG) . "</td></tr>";
+            $html .= "<tr><td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ".api_convert_and_format_date($result['insert_date'], DATE_TIME_FORMAT_LONG)."</td></tr>";
 
             // User or group icon
             $sent_to_icon = '';
@@ -288,7 +288,7 @@ 
                 $sent_to_form = self::sent_to_form($sent_to);
                 $html .= Display::tag(
                     'td',
-                    get_lang('SentTo') . ' : ' . $sent_to_form,
+                    get_lang('SentTo').' : '.$sent_to_form,
                     array('class' => 'announcements_datum')
                 );
             }
@@ -298,15 +298,15 @@ 
                 $html .= "<tr><td>";
                 $realname = $attachment_list['path'];
                 $user_filename = $attachment_list['filename'];
-                $full_file_name = 'download.php?'.api_get_cidreq().'&file=' . $realname;
+                $full_file_name = 'download.php?'.api_get_cidreq().'&file='.$realname;
                 $html .= '<br/>';
                 $html .= Display::return_icon('attachment.gif', get_lang('Attachment'));
-                $html .= '<a href="' . $full_file_name . ' "> ' . $user_filename . ' </a>';
-                $html .= ' - <span class="forum_attach_comment" >' . $attachment_list['comment'] . '</span>';
+                $html .= '<a href="'.$full_file_name.' "> '.$user_filename.' </a>';
+                $html .= ' - <span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
                 if (api_is_allowed_to_edit(false, true)) {
                     $html .= Display::url(
                         Display::return_icon('delete.png', get_lang('Delete'), '', 16),
-                        api_get_self() . "?" . api_get_cidreq() . "&action=delete_attachment&id_attach=" . $attachment_list['id'] . "&sec_token=" . $stok
+                        api_get_self()."?".api_get_cidreq()."&action=delete_attachment&id_attach=".$attachment_list['id']."&sec_token=".$stok
                     );
                 }
                 $html .= '</td></tr>';
@@ -334,7 +334,7 @@ 
         $order = 0;
         if (Database::num_rows($res_max)) {
             $row_max = Database::fetch_array($res_max);
-            $order = intval($row_max[0])+1;
+            $order = intval($row_max[0]) + 1;
         }
 
         return $order;
@@ -754,8 +754,8 @@ 
             $result = array();
             if ($num_rows > 0) {
                 while ($myrow = Database::fetch_array($rs)) {
-                    $content.= '<strong>' . $myrow['title'] . '</strong><br /><br />';
-                    $content.= $myrow['content'];
+                    $content .= '<strong>'.$myrow['title'].'</strong><br /><br />';
+                    $content .= $myrow['content'];
                     $i++;
                 }
                 $result['content'] = $content;
@@ -786,7 +786,7 @@ 
         echo "<table id=\"recipient_list\" >";
         echo '<tr>';
         echo '<td>';
-        echo '<label><input type="checkbox" id="send_to_all_users">'.get_lang('SendToAllUsers') . "</label>";
+        echo '<label><input type="checkbox" id="send_to_all_users">'.get_lang('SendToAllUsers')."</label>";
         echo "</td>";
         echo '</tr>';
         echo '<tr>';
@@ -794,7 +794,7 @@ 
 
         // the form containing all the groups and all the users of the course
         echo '<td>';
-        echo "<strong>" . get_lang('Users') . "</strong><br />";
+        echo "<strong>".get_lang('Users')."</strong><br />";
 
         self::construct_not_selected_select_form($groupList, $userList, $to_already_selected);
         echo "</td>";
@@ -809,7 +809,7 @@ 
         echo "<td>";
 
         // the form containing the selected groups and users
-        echo "<strong>" . get_lang('DestinationUsers') . "</strong><br />";
+        echo "<strong>".get_lang('DestinationUsers')."</strong><br />";
         self::construct_selected_select_form($groupList, $userList, $to_already_selected);
         echo "</td>";
         echo "</tr>";
@@ -827,8 +827,8 @@ 
         echo "<select id=\"not_selected_form\" name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>";
         $group_users = GroupManager::getStudentsAndTutors($group_id);
         foreach ($group_users as $user) {
-            echo '<option value="' . $user['user_id'] . '" title="' . sprintf(get_lang('LoginX'), $user['username']) . '" >' .
-                api_get_person_name($user['firstname'], $user['lastname']) .
+            echo '<option value="'.$user['user_id'].'" title="'.sprintf(get_lang('LoginX'), $user['username']).'" >'.
+                api_get_person_name($user['firstname'], $user['lastname']).
                 '</option>';
         }
         echo '</select>';
@@ -866,12 +866,12 @@ 
         if (!empty($groupList)) {
             foreach ($groupList as $this_group) {
                 if (is_array($to_already_selected)) {
-                    if (!in_array("GROUP:" . $this_group['id'], $to_already_selected)) {
+                    if (!in_array("GROUP:".$this_group['id'], $to_already_selected)) {
                         // $to_already_selected is the array containing the groups (and users) that are already selected
-                        $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser') ;
-                        $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled" ;
-                        echo "<option $user_disabled value=\"GROUP:" . $this_group['id'] . "\">",
-                        "G: ", $this_group['name'], " - " . $this_group['userNb'] . " " . $user_label .
+                        $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser');
+                        $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled";
+                        echo "<option $user_disabled value=\"GROUP:".$this_group['id']."\">",
+                        "G: ", $this_group['name'], " - ".$this_group['userNb']." ".$user_label.
                             "</option>";
                     }
                 }
@@ -885,15 +885,15 @@ 
         if (!empty($userList)) {
             foreach ($userList as $user) {
                 if (is_array($to_already_selected)) {
-                    if (!in_array("USER:" . $user['user_id'], $to_already_selected)) {
+                    if (!in_array("USER:".$user['user_id'], $to_already_selected)) {
                         // $to_already_selected is the array containing the users (and groups) that are already selected
-                        echo "<option value=\"USER:" . $user['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $user['username']) . "'>",
+                        echo "<option value=\"USER:".$user['user_id']."\" title='".sprintf(get_lang('LoginX'), $user['username'])."'>",
                         "", api_get_person_name($user['firstname'], $user['lastname']),
                         "</option>";
 
                         if (isset($user['drh_list']) && !empty($user['drh_list'])) {
                             foreach ($user['drh_list'] as $drh) {
-                                echo "<option value=\"USER:" . $drh['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $drh['username']) . "'>&nbsp;&nbsp;&nbsp;&nbsp;",
+                                echo "<option value=\"USER:".$drh['user_id']."\" title='".sprintf(get_lang('LoginX'), $drh['username'])."'>&nbsp;&nbsp;&nbsp;&nbsp;",
                                 "", api_get_person_name($drh['firstname'], $drh['lastname']),
                                 "</option>";
                             }
@@ -925,16 +925,16 @@ 
             foreach ($to_already_selected as $groupuser) {
                 list($type, $id) = explode(":", $groupuser);
                 if ($type == "GROUP") {
-                    echo "<option value=\"" . $groupuser . "\">G: " . $ref_array_groups[$id]['name'] . "</option>";
+                    echo "<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>";
                 } else {
                     foreach ($ref_array_users as $key => $value) {
                         if ($value['user_id'] == $id) {
-                            echo "<option value=\"" . $groupuser . "\" title='" . sprintf(get_lang('LoginX'), $value['username']) . "'>" .
-                                api_get_person_name($value['firstname'], $value['lastname']) . "</option>";
+                            echo "<option value=\"".$groupuser."\" title='".sprintf(get_lang('LoginX'), $value['username'])."'>".
+                                api_get_person_name($value['firstname'], $value['lastname'])."</option>";
 
                             if (isset($value['drh_list']) && !empty($value['drh_list'])) {
                                 foreach ($value['drh_list'] as $drh) {
-                                    echo "<option value=\"USER:" . $drh['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $drh['username']) . "'>&nbsp;&nbsp;&nbsp;&nbsp;",
+                                    echo "<option value=\"USER:".$drh['user_id']."\" title='".sprintf(get_lang('LoginX'), $drh['username'])."'>&nbsp;&nbsp;&nbsp;&nbsp;",
                                     "", api_get_person_name($drh['firstname'], $drh['lastname']),
                                     "</option>";
                                 }
@@ -950,17 +950,17 @@ 
                 if (is_array($ref_array_groups)) {
                     foreach ($ref_array_groups as $this_group) {
                         //api_display_normal_message("group " . $thisGroup[id] . $thisGroup[name]);
-                        if (!is_array($to_already_selected) || !in_array("GROUP:" . $this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected
-                            echo "<option value=\"GROUP:" . $this_group['id'] . "\">",
-                            "G: ", $this_group['name'], " &ndash; " . $this_group['userNb'] . " " . get_lang('Users') .
+                        if (!is_array($to_already_selected) || !in_array("GROUP:".$this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected
+                            echo "<option value=\"GROUP:".$this_group['id']."\">",
+                            "G: ", $this_group['name'], " &ndash; ".$this_group['userNb']." ".get_lang('Users').
                                 "</option>";
                         }
                     }
                 }
                 // adding the individual users to the select form
                 foreach ($ref_array_users as $this_user) {
-                    if (!is_array($to_already_selected) || !in_array("USER:" . $this_user['user_id'], $to_already_selected)) { // $to_already_selected is the array containing the users (and groups) that are already selected
-                        echo "<option value=\"USER:", $this_user['user_id'], "\"  title='" . sprintf(get_lang('LoginX'), $this_user['username']) . "'>",
+                    if (!is_array($to_already_selected) || !in_array("USER:".$this_user['user_id'], $to_already_selected)) { // $to_already_selected is the array containing the users (and groups) that are already selected
+                        echo "<option value=\"USER:", $this_user['user_id'], "\"  title='".sprintf(get_lang('LoginX'), $this_user['username'])."'>",
                         "", api_get_person_name($this_user['firstname'], $this_user['lastname']),
                         "</option>";
                     }
@@ -1073,14 +1073,14 @@ 
             switch ($to_group) {
                 // it was send to one specific user
                 case null:
-                    $to[] = "USER:" . $row['to_user_id'];
+                    $to[] = "USER:".$row['to_user_id'];
                     break;
                 // it was sent to everyone
                 case 0:
                     return "everyone";
                     break;
                 default:
-                    $to[] = "GROUP:" . $row['to_group_id'];
+                    $to[] = "GROUP:".$row['to_group_id'];
             }
         }
         return $to;
@@ -1161,10 +1161,10 @@ 
                 $sent_to_array['groups'][0] !== 0
             ) {
                 $group_id = $sent_to_array['groups'][0];
-                $output[] = "&nbsp;" . $group_names[$group_id]['name'];
+                $output[] = "&nbsp;".$group_names[$group_id]['name'];
             }
             if (empty($sent_to_array['groups']) and empty($sent_to_array['users'])) {
-                $output[] = "&nbsp;" . get_lang('Everybody');
+                $output[] = "&nbsp;".get_lang('Everybody');
             }
         }
 
@@ -1199,7 +1199,7 @@ 
 
         $sql = "SELECT to_group_id, to_user_id
                 FROM $tbl_item_property
-                WHERE c_id = $course_id AND tool = '$tool' AND ref=" . $id;
+                WHERE c_id = $course_id AND tool = '$tool' AND ref=".$id;
         $result = Database::query($sql);
 
         while ($row = Database::fetch_array($result)) {
@@ -1238,8 +1238,8 @@ 
         $announcement_id = intval($announcement_id);
         $course_id = api_get_course_int_id();
         $row = array();
-        $sql = 'SELECT id, path, filename, comment FROM ' . $tbl_announcement_attachment . '
-				WHERE c_id = ' . $course_id . ' AND announcement_id = ' . $announcement_id . '';
+        $sql = 'SELECT id, path, filename, comment FROM '.$tbl_announcement_attachment.'
+				WHERE c_id = ' . $course_id.' AND announcement_id = '.$announcement_id.'';
         $result = Database::query($sql);
         if (Database::num_rows($result) != 0) {
             $row = Database::fetch_array($result, 'ASSOC');
@@ -1264,9 +1264,9 @@ 
 
         if (is_array($file) && $file['error'] == 0) {
             // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
-            $courseDir = $_course['path'] . '/upload/announcements';
+            $courseDir = $_course['path'].'/upload/announcements';
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $updir = $sys_course_path . $courseDir;
+            $updir = $sys_course_path.$courseDir;
 
             // Try to add an extension to the file if it hasn't one
             $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']);
@@ -1278,7 +1278,7 @@ 
                 Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
             } else {
                 $new_file_name = uniqid('');
-                $new_path = $updir . '/' . $new_file_name;
+                $new_path = $updir.'/'.$new_file_name;
                 move_uploaded_file($file['tmp_name'], $new_path);
 
                 $params = [
@@ -1319,9 +1319,9 @@ 
 
         if (is_array($file) && $file['error'] == 0) {
             // TODO: This path is obsolete. The new document repository scheme should be kept in mind here.
-            $courseDir = $_course['path'] . '/upload/announcements';
+            $courseDir = $_course['path'].'/upload/announcements';
             $sys_course_path = api_get_path(SYS_COURSE_PATH);
-            $updir = $sys_course_path . $courseDir;
+            $updir = $sys_course_path.$courseDir;
 
             // Try to add an extension to the file if it hasn't one
             $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']);
@@ -1333,13 +1333,13 @@ 
                 Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
             } else {
                 $new_file_name = uniqid('');
-                $new_path = $updir . '/' . $new_file_name;
+                $new_path = $updir.'/'.$new_file_name;
                 @move_uploaded_file($file['tmp_name'], $new_path);
                 $safe_file_comment = Database::escape_string($file_comment);
                 $safe_file_name = Database::escape_string($file_name);
                 $safe_new_file_name = Database::escape_string($new_file_name);
                 $id_attach = intval($id_attach);
-                $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='" . intval($file['size']) . "'
+                $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='".intval($file['size'])."'
 					 	WHERE c_id = $course_id AND id = '$id_attach'";
                 $result = Database::query($sql);
                 if ($result === false) {
@@ -1441,7 +1441,7 @@ 
 
             //if (!empty($user_id)) {
             if (0) {
-                if (is_array($group_memberships) && count($group_memberships) > 0 ) {
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
                     $sql = "SELECT $select
                             FROM $tbl_announcement announcement, $tbl_item_property ip
                             WHERE
@@ -1652,8 +1652,8 @@ 
                 $attachment_list = AnnouncementManager::get_attachment($myrow['id']);
 
                 $attachment_icon = '';
-                if (count($attachment_list)>0) {
-                    $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment'));
+                if (count($attachment_list) > 0) {
+                    $attachment_icon = ' '.Display::return_icon('attachment.gif', get_lang('Attachment'));
                 }
 
                 /* TITLE */
@@ -1672,16 +1672,16 @@ 
                     || (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
                 ) {
                     $modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">".
-                        Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>";
-                    if ($myrow['visibility']==1) {
-                        $image_visibility="visible";
-                        $alt_visibility=get_lang('Hide');
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>";
+                    if ($myrow['visibility'] == 1) {
+                        $image_visibility = "visible";
+                        $alt_visibility = get_lang('Hide');
                     } else {
-                        $image_visibility="invisible";
-                        $alt_visibility=get_lang('Visible');
+                        $image_visibility = "invisible";
+                        $alt_visibility = get_lang('Visible');
                     }
-                    $modify_icons .=  "<a href=\"".$actionUrl."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
-                        Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>";
+                    $modify_icons .= "<a href=\"".$actionUrl."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">".
+                        Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>";
 
                     // DISPLAY MOVE UP COMMAND only if it is not the top announcement
                     if ($iterator != 1) {
@@ -1696,12 +1696,12 @@ 
                     } else {
                         $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
                     }
-                    if (api_is_allowed_to_edit(false,true)) {
-                        $modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding()))."')) return false;\">".
-                            Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).
+                    if (api_is_allowed_to_edit(false, true)) {
+                        $modify_icons .= "<a href=\"".$actionUrl."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding()))."')) return false;\">".
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).
                             "</a>";
                     }
-                    $iterator ++;
+                    $iterator++;
                 } else {
                     $modify_icons = Display::url(
                         Display::return_icon('default.png'),
@@ -1731,7 +1731,7 @@ 
     public static function getNumberAnnouncements()
     {
         // Maximum title messages to display
-        $maximum 	= '12';
+        $maximum = '12';
         // Database Table Definitions
         $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
         $tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
@@ -1742,7 +1742,7 @@ 
         $userId = api_get_user_id();
         $condition_session = api_get_session_condition($session_id, true, true, 'announcement.session_id');
 
-        if (api_is_allowed_to_edit(false,true))  {
+        if (api_is_allowed_to_edit(false, true)) {
             // check teacher status
             if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') {
 
@@ -1805,7 +1805,7 @@ 
                 }
 
                 // the user is member of several groups => display personal announcements AND his group announcements AND the general announcements
-                if (is_array($group_memberships) && count($group_memberships)>0) {
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
                     $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
                     FROM $tbl_announcement announcement, $tbl_item_property ip
                     WHERE
@@ -1855,7 +1855,7 @@ 
                         }
 
                         // the user is not identiefied => show only the general announcements
-                        $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
+                        $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id
                                 FROM $tbl_announcement announcement, $tbl_item_property ip
                                 WHERE
                                     announcement.c_id = $course_id AND

main/inc/lib/app_view.php

Doc Comments +3 added lines

@@ -18,6 +18,7 @@ 
     /**
      * Constructor, init tool path for rendering
      * @param string  tool name (optional)
+     * @param string $template_path
      */
     public function __construct($toolname = '', $template_path=null)
     {
@@ -50,6 +51,7 @@ 
     /**
      * Set layout view sent from a controller
      * @param string layout view
+     * @param string $layout
      */
     public function set_layout( $layout )
     {
@@ -59,6 +61,7 @@ 
     /**
      * Set template view sent from a controller
      * @param string template view
+     * @param string $template
      */
     public function set_template($template)
     {

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
      * Constructor, init tool path for rendering
      * @param string  tool name (optional)
      */
-    public function __construct($toolname = '', $template_path=null)
+    public function __construct($toolname = '', $template_path = null)
     {
         if (!empty($toolname)) {
             if (isset($template_path)) {
@@ -30,7 +30,7 @@ 
             if (is_dir($path)) {
                 $this->tool_path = $path;
             } else {
-                throw new ViewException('View::__construct() $path directory does not exist ' . $path);
+                throw new ViewException('View::__construct() $path directory does not exist '.$path);
             }
         }
     }
@@ -42,7 +42,7 @@ 
     public function set_data($data)
     {
         if (!is_array($data)) {
-            throw new ViewException('View::set_data() $data must to be an array, you have sent a' . gettype( $data ));
+            throw new ViewException('View::set_data() $data must to be an array, you have sent a'.gettype($data));
         }
         $this->data = $data;
     }
@@ -51,7 +51,7 @@ 
      * Set layout view sent from a controller
      * @param string layout view
      */
-    public function set_layout( $layout )
+    public function set_layout($layout)
     {
         $this->layout = $layout;
     }

main/inc/lib/banner.lib.php

Doc Comments +6 added lines

@@ -147,6 +147,9 @@ 
     return $customTabs;
 }
 
+/**
+ * @param string $theme
+ */
 function return_logo($theme)
 {
     $_course = api_get_course_info();
@@ -497,6 +500,9 @@ 
     return $menu;
 }
 
+/**
+ * @param string $nameTools
+ */
 function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
 {
     $session_id = api_get_session_id();

Indentation +20 added lines, -20 removed lines

@@ -42,20 +42,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');
@@ -79,21 +79,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';
@@ -116,14 +116,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;
 }
 
 /**
@@ -351,7 +351,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')) {
@@ -492,7 +492,7 @@ 
 
     $menu = null;
     if (!empty($lis)) {
-         $menu .= $lis;
+            $menu .= $lis;
     }
     return $menu;
 }
@@ -548,7 +548,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 +38 added lines, -38 removed lines

@@ -39,7 +39,7 @@ 
     $navigation['mycourses']['key'] = 'my-course';
 
     // 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';
 	// Link to my agenda
@@ -49,7 +49,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';
 	}
@@ -57,11 +57,11 @@ 
 	// 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';
     } 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';
     } else {
@@ -80,7 +80,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';
@@ -161,14 +161,14 @@ 
         'id' => 'header-logo'
     );
     $testServer = api_get_setting('server_type');
-    if ($testServer == 'test' && is_file($logoBase . 'svg')) {
-        $logo = $logoBase . 'svg';
+    if ($testServer == 'test' && is_file($logoBase.'svg')) {
+        $logo = $logoBase.'svg';
         $attributes['width'] = '245';
         $attributes['height'] = '68';
         $imageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.svg';
     } else {
-        $logo = $logoBase . 'png';
-        $customLogo = $customLogoBase . 'png';
+        $logo = $logoBase.'png';
+        $customLogo = $customLogoBase.'png';
         $imageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.png';
         $customImageUrl = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo-custom.png';
     }
@@ -218,7 +218,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();
@@ -315,7 +315,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'];
             }
         }
@@ -340,7 +340,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;
         }
 
@@ -349,7 +349,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;
         }
 
@@ -440,32 +440,32 @@ 
     $home_top = '';
 
     if (is_file($homep.$menutabs.'_'.$lang.$ext) && is_readable($homep.$menutabs.'_'.$lang.$ext)) {
-        $home_top = @(string)file_get_contents($homep.$menutabs.'_'.$lang.$ext);
+        $home_top = @(string) file_get_contents($homep.$menutabs.'_'.$lang.$ext);
     } elseif (is_file($homep.$menutabs.$lang.$ext) && is_readable($homep.$menutabs.$lang.$ext)) {
-        $home_top = @(string)file_get_contents($homep.$menutabs.$lang.$ext);
+        $home_top = @(string) file_get_contents($homep.$menutabs.$lang.$ext);
     } else {
         //$errorMsg = get_lang('HomePageFilesNotReadable');
     }
 
     $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
 
-    $open = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top);
+    $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top);
     $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
 
     $open_mtloggedin = '';
     if (api_get_user_id() && !api_is_anonymous()) {
         if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) {
-            $home_top = @(string)file_get_contents($homep.$mtloggedin.'_'.$lang.$ext);
+            $home_top = @(string) file_get_contents($homep.$mtloggedin.'_'.$lang.$ext);
             $home_top = str_replace('::private', '', $home_top);
         } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) {
-            $home_top = @(string)file_get_contents($homep.$mtloggedin.$lang.$ext);
+            $home_top = @(string) file_get_contents($homep.$mtloggedin.$lang.$ext);
             $home_top = str_replace('::private', '', $home_top);
         } else {
             //$errorMsg = get_lang('HomePageFilesNotReadable');
         }
 
         $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top)));
-        $open_mtloggedin = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top);
+        $open_mtloggedin = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top);
         $open_mtloggedin = api_to_system_encoding($open_mtloggedin, api_detect_encoding(strip_tags($open_mtloggedin)));
     }
 
@@ -474,7 +474,7 @@ 
     if (!empty($open) OR !empty($open_mtloggedin)) {
         if (strpos($open.$open_mtloggedin, 'show_menu') === false) {
             if (api_is_anonymous()) {
-                $navigation[SECTION_CAMPUS]  = null;
+                $navigation[SECTION_CAMPUS] = null;
             }
         } else {
             if (api_get_user_id() && !api_is_anonymous()) {
@@ -488,7 +488,7 @@ 
     if (count($navigation) > 0 || !empty($lis)) {
         $pre_lis = '';
         foreach ($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'])) {
                 $current = $section == $GLOBALS['this_section'] ? ' id="current" class="active '.$key.'" ' : ' class="'.$key.'"';
             } else {
@@ -532,7 +532,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);
 
@@ -547,7 +547,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;
@@ -581,22 +581,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
@@ -663,35 +663,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'));
             }
         }
 

main/inc/lib/browser/Browser.php

Doc Comments +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
 
     /**
      * Set the name of the browser
-     * @param $browser string The name of the Browser
+     * @param string $browser string The name of the Browser
      */
     public function setBrowser($browser)
     {
@@ -266,7 +266,7 @@ 
 
     /**
      * Set the browser to be from AOL
-     * @param $isAol
+     * @param boolean $isAol
      */
     public function setAol($isAol)
     {

Indentation +9 added lines, -9 removed lines

@@ -256,9 +256,9 @@ 
     }
 
     /**
-    * Is the browser from facebook?
-    * @return boolean True if the browser is from facebook otherwise false
-    */
+     * Is the browser from facebook?
+     * @return boolean True if the browser is from facebook otherwise false
+     */
     public function isFacebook() 
     { 
         return $this->_is_facebook;
@@ -591,12 +591,12 @@ 
             }
             return true;
         } // Test for versions > IE 10
-		else if(stripos($this->_agent, 'trident') !== false) {
-			$this->setBrowser(self::BROWSER_IE);
-			$result = explode('rv:', $this->_agent);
-			$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
-			$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
-		} // Test for Pocket IE
+        else if(stripos($this->_agent, 'trident') !== false) {
+            $this->setBrowser(self::BROWSER_IE);
+            $result = explode('rv:', $this->_agent);
+            $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
+            $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
+        } // Test for Pocket IE
         else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
             $aresult = explode(' ', stristr($this->_agent, 'mspie'));
             $this->setPlatform(self::PLATFORM_WINDOWS_CE);

Spacing +16 added lines, -16 removed lines

@@ -345,9 +345,9 @@ 
      */
     public function __toString()
     {
-        return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-        "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-        "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+        return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n".
+        "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n".
+        "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n".
         "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
     }
 
@@ -585,13 +585,13 @@ 
             $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
             $this->setBrowser(self::BROWSER_IE);
             $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-            if(stripos($this->_agent, 'IEMobile') !== false) {
+            if (stripos($this->_agent, 'IEMobile') !== false) {
                 $this->setBrowser(self::BROWSER_POCKET_IE);
                 $this->setMobile(true);
             }
             return true;
         } // Test for versions > IE 10
-		else if(stripos($this->_agent, 'trident') !== false) {
+		else if (stripos($this->_agent, 'trident') !== false) {
 			$this->setBrowser(self::BROWSER_IE);
 			$result = explode('rv:', $this->_agent);
 			$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
@@ -1012,7 +1012,7 @@ 
      */
     protected function checkFacebookExternalHit()
     {
-        if(stristr($this->_agent,'FacebookExternalHit'))
+        if (stristr($this->_agent, 'FacebookExternalHit'))
         {
             $this->setRobot(true);
             $this->setFacebook(true);
@@ -1027,7 +1027,7 @@ 
      */
     protected function checkForFacebookIos()
     {
-        if(stristr($this->_agent,'FBIOS'))
+        if (stristr($this->_agent, 'FBIOS'))
         {
             $this->setFacebook(true);
             return true;
@@ -1041,10 +1041,10 @@ 
      */
     protected function getSafariVersionOnIos()
     {
-        $aresult = explode('/',stristr($this->_agent,'Version'));
-        if( isset($aresult[1]) )
+        $aresult = explode('/', stristr($this->_agent, 'Version'));
+        if (isset($aresult[1]))
         {
-            $aversion = explode(' ',$aresult[1]);
+            $aversion = explode(' ', $aresult[1]);
             $this->setVersion($aversion[0]);
             return true;
         }
@@ -1057,10 +1057,10 @@ 
      */
     protected function getChromeVersionOnIos()
     {
-        $aresult = explode('/',stristr($this->_agent,'CriOS'));
-        if( isset($aresult[1]) )
+        $aresult = explode('/', stristr($this->_agent, 'CriOS'));
+        if (isset($aresult[1]))
         {
-            $aversion = explode(' ',$aresult[1]);
+            $aversion = explode(' ', $aresult[1]);
             $this->setVersion($aversion[0]);
             $this->setBrowser(self::BROWSER_CHROME);
             return true;
@@ -1073,7 +1073,7 @@ 
      * @return boolean True if the browser is iPhone otherwise false
      */
     protected function checkBrowseriPhone() {
-        if( stripos($this->_agent,'iPhone') !== false ) {
+        if (stripos($this->_agent, 'iPhone') !== false) {
             $this->setVersion(self::VERSION_UNKNOWN);
             $this->setBrowser(self::BROWSER_IPHONE);
             $this->getSafariVersionOnIos();
@@ -1090,7 +1090,7 @@ 
      * @return boolean True if the browser is iPad otherwise false
      */
     protected function checkBrowseriPad() {
-        if( stripos($this->_agent,'iPad') !== false ) {
+        if (stripos($this->_agent, 'iPad') !== false) {
             $this->setVersion(self::VERSION_UNKNOWN);
             $this->setBrowser(self::BROWSER_IPAD);
             $this->getSafariVersionOnIos();
@@ -1107,7 +1107,7 @@ 
      * @return boolean True if the browser is iPod otherwise false
      */
     protected function checkBrowseriPod() {
-        if( stripos($this->_agent,'iPod') !== false ) {
+        if (stripos($this->_agent, 'iPod') !== false) {
             $this->setVersion(self::VERSION_UNKNOWN);
             $this->setBrowser(self::BROWSER_IPOD);
             $this->getSafariVersionOnIos();

Braces +16 added lines, -32 removed lines

@@ -1152,68 +1152,52 @@
         if (stripos($this->_agent, 'windows') !== false)
         {
             $this->_platform = self::PLATFORM_WINDOWS;
-        }
-        else if (stripos($this->_agent, 'iPad') !== false)
+        } else if (stripos($this->_agent, 'iPad') !== false)
         {
             $this->_platform = self::PLATFORM_IPAD;
-        }
-        else if (stripos($this->_agent, 'iPod') !== false)
+        } else if (stripos($this->_agent, 'iPod') !== false)
         {
             $this->_platform = self::PLATFORM_IPOD;
-        }
-        else if (stripos($this->_agent, 'iPhone') !== false)
+        } else if (stripos($this->_agent, 'iPhone') !== false)
         {
             $this->_platform = self::PLATFORM_IPHONE;
-        }
-        elseif (stripos($this->_agent, 'mac') !== false)
+        } elseif (stripos($this->_agent, 'mac') !== false)
         {
             $this->_platform = self::PLATFORM_APPLE;
-        }
-        elseif (stripos($this->_agent, 'android') !== false)
+        } elseif (stripos($this->_agent, 'android') !== false)
         {
             $this->_platform = self::PLATFORM_ANDROID;
-        }
-        elseif (stripos($this->_agent, 'linux') !== false)
+        } elseif (stripos($this->_agent, 'linux') !== false)
         {
             $this->_platform = self::PLATFORM_LINUX;
-        }
-        else if (stripos($this->_agent, 'Nokia') !== false)
+        } else if (stripos($this->_agent, 'Nokia') !== false)
         {
             $this->_platform = self::PLATFORM_NOKIA;
-        }
-        else if (stripos($this->_agent, 'BlackBerry') !== false)
+        } else if (stripos($this->_agent, 'BlackBerry') !== false)
         {
             $this->_platform = self::PLATFORM_BLACKBERRY;
-        }
-        elseif (stripos($this->_agent, 'FreeBSD') !== false)
+        } elseif (stripos($this->_agent, 'FreeBSD') !== false)
         {
             $this->_platform = self::PLATFORM_FREEBSD;
-        }
-        elseif (stripos($this->_agent, 'OpenBSD') !== false)
+        } elseif (stripos($this->_agent, 'OpenBSD') !== false)
         {
             $this->_platform = self::PLATFORM_OPENBSD;
-        }
-        elseif (stripos($this->_agent, 'NetBSD') !== false)
+        } elseif (stripos($this->_agent, 'NetBSD') !== false)
         {
             $this->_platform = self::PLATFORM_NETBSD;
-        }
-        elseif (stripos($this->_agent, 'OpenSolaris') !== false)
+        } elseif (stripos($this->_agent, 'OpenSolaris') !== false)
         {
             $this->_platform = self::PLATFORM_OPENSOLARIS;
-        }
-        elseif (stripos($this->_agent, 'SunOS') !== false)
+        } elseif (stripos($this->_agent, 'SunOS') !== false)
         {
             $this->_platform = self::PLATFORM_SUNOS;
-        }
-        elseif (stripos($this->_agent, 'OS\/2') !== false)
+        } elseif (stripos($this->_agent, 'OS\/2') !== false)
         {
             $this->_platform = self::PLATFORM_OS2;
-        }
-        elseif (stripos($this->_agent, 'BeOS') !== false)
+        } elseif (stripos($this->_agent, 'BeOS') !== false)
         {
             $this->_platform = self::PLATFORM_BEOS;
-        }
-        elseif (stripos($this->_agent, 'win') !== false)
+        } elseif (stripos($this->_agent, 'win') !== false)
         {
             $this->_platform = self::PLATFORM_WINDOWS;
         }

main/inc/lib/chat.lib.php

Doc Comments +2 added lines

@@ -41,6 +41,7 @@ 
     /**
     * Set user chat status
     * @param int 0 if disconnected, 1 if connected
+    * @param integer $status
      *
     * @return void
     */
@@ -164,6 +165,7 @@ 
     /**
      * Saves into session the fact that a chat window exists with the given user
      * @param int The ID of the user with whom the current user is chatting
+     * @param integer $user_id
      * @return void
      */
     public function save_window($user_id)

Indentation +9 added lines, -9 removed lines

@@ -39,11 +39,11 @@ 
     }
 
     /**
-    * Set user chat status
-    * @param int 0 if disconnected, 1 if connected
+     * Set user chat status
+     * @param int 0 if disconnected, 1 if connected
      *
-    * @return void
-    */
+     * @return void
+     */
     public function setUserStatus($status)
     {
         UserManager::update_extra_field_value(api_get_user_id(), 'user_chat_status', $status);
@@ -147,10 +147,10 @@ 
     }
 
     /**
-    * Returns an array of messages inside a chat session with a specific user
-    * @param int The ID of the user with whom the current user is chatting
-    * @return array Messages list
-    */
+     * Returns an array of messages inside a chat session with a specific user
+     * @param int The ID of the user with whom the current user is chatting
+     * @return array Messages list
+     */
     public function box_session($user_id)
     {
         $items = array();
@@ -297,7 +297,7 @@ 
             }
         }
          
-         return false;
+            return false;
     }
     
     public function is_chat_blocked_by_exercises()

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         $to_user_id,
         $message,
         $printResult = true,
-        $sanitize =  true
+        $sanitize = true
     )
     {
         $user_friend_relation = SocialManager::get_relation_between_contacts(
@@ -206,7 +206,7 @@ 
                 $messagesan = $message;
             }
 
-            error_log(print_r($sanitize) . '----' . $messagesan);
+            error_log(print_r($sanitize).'----'.$messagesan);
 
             if (!isset($_SESSION['chatHistory'][$to_user_id])) {
                 $_SESSION['chatHistory'][$to_user_id] = array();
@@ -289,9 +289,9 @@ 
      */
     public static function disableChat()
     {
-        if (!empty($_SESSION['disable_chat'])){
+        if (!empty($_SESSION['disable_chat'])) {
             $status = $_SESSION['disable_chat'];
-            if ($status == true){
+            if ($status == true) {
                 $_SESSION['disable_chat'] = null;
                 return true;
             }

main/inc/lib/course.lib.php

Doc Comments +34 added lines, -20 removed lines

@@ -716,7 +716,7 @@ 
      * @param  int $status (optional) The user's status in the course
      * @param  int The user category in which this subscription will be classified
      *
-     * @return boolean true if subscription succeeds, boolean false otherwise.
+     * @return false|string true if subscription succeeds, boolean false otherwise.
      * @assert ('', '') === false
      */
     public static function add_user_to_course($user_id, $courseCode, $status = STUDENT, $userCourseCategoryId = 0)
@@ -788,7 +788,7 @@ 
      *    Checks wether a parameter exists.
      *    If it doesn't, the function displays an error message.
      *
-     * @return true if parameter is set and not empty, false otherwise
+     * @return boolean if parameter is set and not empty, false otherwise
      * @todo move function to better place, main_api ?
      */
     public static function check_parameter($parameter, $error_message)
@@ -812,7 +812,7 @@ 
     }
 
     /**
-     * @return true if there already are one or more courses
+     * @return boolean if there already are one or more courses
      *  with the same code OR visual_code (visualcode), false otherwise
      */
     public static function course_code_exists($wanted_course_code)
@@ -985,7 +985,7 @@ 
     /**
      * @param int $userId
      * @param array $courseInfo
-     * @return bool
+     * @return boolean|null
      */
     public static function isUserSubscribedInCourseAsDrh($userId, $courseInfo)
     {
@@ -1091,10 +1091,10 @@ 
     /**
      *    Is the user a teacher in the given course?
      *
-     * @param $user_id , the id (int) of the user
+     * @param integer $user_id , the id (int) of the user
      * @param $course_code , the course code
      *
-     * @return true if the user is a teacher in the course, false otherwise
+     * @return boolean if the user is a teacher in the course, false otherwise
      */
     public static function is_course_teacher($user_id, $course_code)
     {
@@ -1123,7 +1123,7 @@ 
      * @param int the id of the user
      * @param int $courseId
      * @deprecated linked_courses definition doesn't exists
-     * @return true if the user is registered in the real course or linked courses, false otherwise
+     * @return boolean if the user is registered in the real course or linked courses, false otherwise
      */
     public static function is_user_subscribed_in_real_or_linked_course($user_id, $courseId, $session_id = '')
     {
@@ -1194,9 +1194,9 @@ 
      * @param string $order_by the field to order the users by.
      * Valid values are 'lastname', 'firstname', 'username', 'email', 'official_code' OR a part of a SQL statement
      * that starts with ORDER BY ...
-     * @param null $filter_by_status if using the session_id: 0 or 2 (student, coach),
+     * @param integer|null $filter_by_status if using the session_id: 0 or 2 (student, coach),
      * if using session_id = 0 STUDENT or COURSEMANAGER
-     * @param null $return_count
+     * @param boolean|null $return_count
      * @param bool $add_reports
      * @param bool $resumed_report
      * @param array $extra_field
@@ -1943,7 +1943,7 @@ 
      * @param int $courseId
      * @param string $separator
      * @param bool $add_link_to_profile
-     * @return null|string
+     * @return string
      */
     public static function get_coachs_from_course_to_string(
         $session_id = 0,
@@ -2016,7 +2016,7 @@ 
      * Get the list of groups from the course
      * @param   string $course_code
      * @param   int $session_id Session ID (optional)
-     * @param   boolean $in_get_empty_group get empty groups (optional)
+     * @param   integer $in_get_empty_group get empty groups (optional)
      * @return  array   List of groups info
      */
     public static function get_group_list_of_course($course_code, $session_id = 0, $in_get_empty_group = 0)
@@ -2072,6 +2072,7 @@ 
      * course.
      *
      * @param string The code of the course to delete
+     * @param string $code
      * @todo When deleting a virtual course: unsubscribe users from that virtual
      * course from the groups in the real course if they are not subscribed in
      * that real course.
@@ -2283,6 +2284,7 @@ 
      * Sort courses for a specific user ??
      * @param   int     User ID
      * @param   string  Course code
+     * @param integer $user_id
      * @return  int     Minimum course order
      * @todo Review documentation
      */
@@ -2360,7 +2362,7 @@ 
      * check if course exists
      * @param string course_code
      * @param string whether to accept virtual course codes or not
-     * @return true if exists, false else
+     * @return integer if exists, false else
      */
     public static function course_exists($course_code, $accept_virtual = false)
     {
@@ -2379,9 +2381,9 @@ 
      * Send an email to tutor after the auth-suscription of a student in your course
      * @author Carlos Vargas <carlos.vargas@dokeos.com>, Dokeos Latino
      * @param  int $user_id the id of the user
-     * @param  string $course_code the course code
+     * @param  string $courseId the course code
      * @param  bool $send_to_tutor_also
-     * @return string we return the message that is displayed when the action is successful
+     * @return false|null we return the message that is displayed when the action is successful
      */
     public static function email_to_tutor($user_id, $courseId, $send_to_tutor_also = false)
     {
@@ -2624,6 +2626,7 @@ 
     /**
      * Get emails of tutors to course
      * @param string Visual code
+     * @param integer $courseId
      * @return array List of emails of tutors to course
      * @author @author Carlos Vargas <carlos.vargas@dokeos.com>, Dokeos Latino
      * */
@@ -2647,6 +2650,7 @@ 
      * Get coaches emails by session
      * @param int session id
      * @param int $courseId
+     * @param integer $session_id
      * @return array  array(email => name_tutor)  by coach
      * @author Carlos Vargas <carlos.vargas@dokeos.com>
      */
@@ -2695,7 +2699,9 @@ 
      * @param    string    Field's internal variable name
      * @param    int        Field's type
      * @param    string    Field's language var name
-     * @return int     new extra field id
+     * @param integer $fieldType
+     * @param string $default
+     * @return boolean     new extra field id
      */
     public static function create_course_extra_field($variable, $fieldType, $displayText, $default)
     {
@@ -2717,7 +2723,7 @@ 
      * @param int Course id
      * @param string Attribute name
      * @param string Attribute value
-     * @return bool True if attribute was successfully updated,
+     * @return Doctrine\DBAL\Driver\Statement|null True if attribute was successfully updated,
      * false if course was not found or attribute name is invalid
      */
     public static function update_attribute($id, $name, $value)
@@ -2735,7 +2741,7 @@ 
      *
      * @param int Course id
      * @param array Associative array with field names as keys and field values as values
-     * @return bool True if update was successful, false otherwise
+     * @return Doctrine\DBAL\Driver\Statement|null True if update was successful, false otherwise
      */
     public static function update_attributes($id, $attributes)
     {
@@ -2761,7 +2767,7 @@ 
      * @param    integer    Course ID
      * @param    string    Field variable name
      * @param    string    Field value
-     * @return    boolean    true if field updated, false otherwise
+     * @return    boolean|null    true if field updated, false otherwise
      */
     public static function update_course_extra_field_value($course_code, $variable, $value = '')
     {
@@ -3483,6 +3489,7 @@ 
      * @uses displayCoursesInCategory() to display the courses themselves
      * @param int        user id
      * @param bool      Whether to show the document quick-loader or not
+     * @param integer $user_id
      * @return string
      */
     public static function display_courses($user_id, $load_dirs = false)
@@ -4057,6 +4064,8 @@ 
      * @param     int        source session id
      * @param    string    destination course code
      * @param     int        destination session id
+     * @param integer $source_session_id
+     * @param integer $destination_session_id
      * @return  bool
      */
     public static function copy_course(
@@ -4091,6 +4100,7 @@ 
      * @param     int        source session id
      * @param     int        destination session id
      * @param    bool    new copied tools (Exercises and LPs)will be set to invisible by default?
+     * @param string $new_title
      *
      * @return     array
      */
@@ -4344,6 +4354,7 @@ 
      * @param int   course id
      * @param int   session id
      * @param id    url id
+     * @param integer $session_id
      * @return array
      **/
     public static function update_course_ranking(
@@ -4426,7 +4437,7 @@ 
      * @param   int course id
      * @param   int session id
      * @param   int url id (access_url_id)
-     * @return    mixed 'added', 'updated' or 'nothing'
+     * @return    false|string 'added', 'updated' or 'nothing'
      */
     public static function add_course_vote($user_id, $vote, $course_id, $session_id = null, $url_id = null)
     {
@@ -4681,6 +4692,7 @@ 
      * Get courses count
      * @param int Access URL ID (optional)
      * @param int $visibility
+     * @param integer $access_url_id
      *
      * @return int Number of courses
      */
@@ -4737,6 +4749,7 @@ 
     /**
      * Get available le courses count
      * @param int Access URL ID (optional)
+     * @param integer $accessUrlId
      * @return int Number of courses
      */
     public static function countAvailableCourses($accessUrlId = null)
@@ -4781,6 +4794,7 @@ 
      * @param int User ID
      * @param array Course details array
      * @param array  List of courses to which the user is subscribed (if not provided, will be generated)
+     * @param integer $uid
      * @return mixed 'enter' for a link to go to the course or 'register' for a link to subscribe, or false if no access
      */
     static function get_access_link_by_user($uid, $course, $user_courses = array())
@@ -4851,7 +4865,7 @@ 
      * @param bool $deleteTeachersNotInList
      * @param bool $editTeacherInSessions
      * @param bool $deleteSessionTeacherNotInList
-     * @return bool
+     * @return false|null
      */
     public static function updateTeachers(
         $courseId,

Indentation +2 added lines, -2 removed lines

@@ -1679,7 +1679,7 @@ 
 
         // We get the coach for the given course in a given session.
         $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) .
-               ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
+                ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $user_info = api_get_user_info($user['user_id']);
@@ -3972,7 +3972,7 @@ 
         }
 
         $session_title .= isset($course['special_course']) ? ' ' .
-                          Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
+                            Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
 
         $params['title'] = $session_title;
         $params['extra'] = '';

Spacing +327 added lines, -328 removed lines

@@ -128,9 +128,9 @@ 
                     $template = api_get_setting('course_creation_use_template');
                     if (!empty($template)) {
                         // Include the necessary libraries to generate a course copy
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseBuilder.class.php';
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseRestorer.class.php';
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseSelectForm.class.php';
+                        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseBuilder.class.php';
+                        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseRestorer.class.php';
+                        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseSelectForm.class.php';
                         // Call the course copy object
                         $originCourse = api_get_course_info_by_id($template);
                         $originCourse['official_code'] = $originCourse['code'];
@@ -166,8 +166,8 @@ 
     {
         return Database::fetch_array(
             Database::query(
-                "SELECT *, id as real_id FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE code='" . Database::escape_string($course_code) . "'"), 'ASSOC'
+                "SELECT *, id as real_id FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
+                WHERE code='" . Database::escape_string($course_code)."'"), 'ASSOC'
         );
     }
 
@@ -195,7 +195,7 @@ 
         $alsoSearchCode = false,
         $conditionsLike = array()
     ) {
-        $sql = "SELECT course.* FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . " course ";
+        $sql = "SELECT course.* FROM ".Database::get_main_table(TABLE_MAIN_COURSE)." course ";
 
         if (!empty($urlId)) {
             $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -203,9 +203,9 @@ 
         }
 
         if (!empty($startwith)) {
-            $sql .= "WHERE (title LIKE '" . Database::escape_string($startwith) . "%' ";
+            $sql .= "WHERE (title LIKE '".Database::escape_string($startwith)."%' ";
             if ($alsoSearchCode) {
-                $sql .= "OR code LIKE '" . Database::escape_string($startwith) . "%' ";
+                $sql .= "OR code LIKE '".Database::escape_string($startwith)."%' ";
             }
             $sql .= ') ';
             if ($visibility !== -1 && $visibility == strval(intval($visibility))) {
@@ -239,19 +239,19 @@ 
                 $value = Database::escape_string($value);
                 $simple_like = false;
                 if ($simple_like) {
-                    $temp_conditions[] = $field . " LIKE '$value%'";
+                    $temp_conditions[] = $field." LIKE '$value%'";
                 } else {
-                    $temp_conditions[] = $field . ' LIKE \'%' . $value . '%\'';
+                    $temp_conditions[] = $field.' LIKE \'%'.$value.'%\'';
                 }
             }
             $condition = ' AND ';
             if (!empty($temp_conditions)) {
-                $sql .= implode(' ' . $condition . ' ', $temp_conditions);
+                $sql .= implode(' '.$condition.' ', $temp_conditions);
             }
         }
 
         if (!empty($orderby)) {
-            $sql .= " ORDER BY " . Database::escape_string($orderby) . " ";
+            $sql .= " ORDER BY ".Database::escape_string($orderby)." ";
         } else {
             $sql .= " ORDER BY 1 ";
         }
@@ -263,13 +263,13 @@ 
         }
 
         if (!empty($howmany) && is_int($howmany) and $howmany > 0) {
-            $sql .= ' LIMIT ' . Database::escape_string($howmany);
+            $sql .= ' LIMIT '.Database::escape_string($howmany);
         } else {
             $sql .= ' LIMIT 1000000'; //virtually no limit
         }
         if (!empty($from)) {
             $from = intval($from);
-            $sql .= ' OFFSET ' . intval($from);
+            $sql .= ' OFFSET '.intval($from);
         } else {
             $sql .= ' OFFSET 0';
         }
@@ -293,8 +293,8 @@ 
         return Database::fetch_array(
             Database::query(
                 "SELECT visibility, subscribe, unsubscribe
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE code = '" . Database::escape_string($course_code) . "'"
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE)."
+                WHERE code = '" . Database::escape_string($course_code)."'"
             )
         );
     }
@@ -312,10 +312,10 @@ 
         $courseId = $courseInfo['real_id'];
         $result = Database::fetch_array(
             Database::query(
-                "SELECT status FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+                "SELECT status FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
                     c_id  = $courseId AND
-                    user_id = " . intval($user_id)
+                    user_id = ".intval($user_id)
             )
         );
 
@@ -333,9 +333,9 @@ 
 
         $result = Database::fetch_array(
             Database::query("
-                SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+                SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
-                    c_id  = '" . intval($courseId). "' AND
+                    c_id  = '" . intval($courseId)."' AND
                     user_id = " . intval($userId)
             )
         );
@@ -382,9 +382,9 @@ 
         $result = Database::fetch_array(
             Database::query("
                 SELECT is_tutor
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
-                    course_code = '" . Database::escape_string($course_code) . "' AND
+                    course_code = '" . Database::escape_string($course_code)."' AND
                     user_id = " . intval($user_id)
             )
         );
@@ -437,17 +437,17 @@ 
         $course_id = $course_info['real_id'];
 
         // Unsubscribe user from all groups in the course.
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_GROUP_USER) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_GROUP_USER)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_GROUP_TUTOR) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_GROUP_TUTOR)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
 
         // Erase user student publications (works) in the course - by André Boivin
 
         if (!empty($user_list)) {
-            require_once api_get_path(SYS_CODE_PATH) . 'work/work.lib.php';
+            require_once api_get_path(SYS_CODE_PATH).'work/work.lib.php';
             foreach ($user_list as $userId) {
                 // Getting all work from user
                 $workList = getWorkPerUser($userId);
@@ -466,74 +466,74 @@ 
         }
 
         // Unsubscribe user from all blogs in the course.
-        Database::query("DELETE FROM " . Database::get_course_table(TABLE_BLOGS_REL_USER) . " WHERE c_id = $course_id AND  user_id IN (" . $user_ids . ")");
-        Database::query("DELETE FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " WHERE c_id = $course_id AND  user_id IN (" . $user_ids . ")");
+        Database::query("DELETE FROM ".Database::get_course_table(TABLE_BLOGS_REL_USER)." WHERE c_id = $course_id AND  user_id IN (".$user_ids.")");
+        Database::query("DELETE FROM ".Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER)." WHERE c_id = $course_id AND  user_id IN (".$user_ids.")");
 
         // Deleting users in forum_notification and mailqueue course tables
-        $sql = "DELETE FROM  " . Database::get_course_table(TABLE_FORUM_NOTIFICATION) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM  ".Database::get_course_table(TABLE_FORUM_NOTIFICATION)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
 
-        $sql = "DELETE FROM " . Database::get_course_table(TABLE_FORUM_MAIL_QUEUE) . "
-                WHERE c_id = $course_id AND user_id IN (" . $user_ids . ")";
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_FORUM_MAIL_QUEUE)."
+                WHERE c_id = $course_id AND user_id IN (".$user_ids.")";
         Database::query($sql);
 
         // Unsubscribe user from the course.
         if (!empty($session_id)) {
 
             // Delete in table session_rel_course_rel_user
-            $sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
+            $sql = "DELETE FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
                     WHERE
-                        session_id ='" . $session_id . "' AND
-                        c_id = '" . $course_id . "' AND
+                        session_id ='" . $session_id."' AND
+                        c_id = '" . $course_id."' AND
                         user_id IN ($user_ids)";
             Database::query($sql);
 
             foreach ($user_list as $uid) {
                 // check if a user is register in the session with other course
-                $sql = "SELECT user_id FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
+                $sql = "SELECT user_id FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
                         WHERE session_id='$session_id' AND user_id='$uid'";
                 $rs = Database::query($sql);
 
                 if (Database::num_rows($rs) == 0) {
                     // Delete in table session_rel_user
-                    $sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_SESSION_USER) . "
+                    $sql = "DELETE FROM ".Database::get_main_table(TABLE_MAIN_SESSION_USER)."
                             WHERE
-                                session_id ='" . $session_id . "' AND
+                                session_id ='" . $session_id."' AND
                                 user_id = '$uid' AND
-                                relation_type<>" . SESSION_RELATION_TYPE_RRHH . "";
+                                relation_type<>".SESSION_RELATION_TYPE_RRHH."";
                     Database::query($sql);
                 }
             }
 
             // Update the table session
-            $sql = "SELECT COUNT(*) FROM " . Database::get_main_table(TABLE_MAIN_SESSION_USER) . "
-                    WHERE session_id = '" . $session_id . "' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH;
+            $sql = "SELECT COUNT(*) FROM ".Database::get_main_table(TABLE_MAIN_SESSION_USER)."
+                    WHERE session_id = '" . $session_id."' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH;
             $row = Database::fetch_array(Database::query($sql));
             $count = $row[0];
             // number of users by session
-            $sql = "UPDATE " . Database::get_main_table(TABLE_MAIN_SESSION) . " SET nbr_users = '$count'
-                    WHERE id = '" . $session_id . "'";
+            $sql = "UPDATE ".Database::get_main_table(TABLE_MAIN_SESSION)." SET nbr_users = '$count'
+                    WHERE id = '".$session_id."'";
             Database::query($sql);
 
             // Update the table session_rel_course
-            $sql = "SELECT COUNT(*) FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
+            $sql = "SELECT COUNT(*) FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
                     WHERE session_id = '$session_id' AND c_id = '$course_id' AND status<>2";
             $row = Database::fetch_array(@Database::query($sql));
             $count = $row[0];
 
             // number of users by session and course
-            $sql = "UPDATE " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE) . "
+            $sql = "UPDATE ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE)."
                     SET nbr_users = '$count'
                     WHERE session_id = '$session_id' AND c_id = '$course_id'";
             Database::query($sql);
 
         } else {
-            $sql = "DELETE FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+            $sql = "DELETE FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                     WHERE
-                        user_id IN (" . $user_ids . ") AND
-                        relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
-                        c_id = '" . $course_id . "'";
+                        user_id IN (" . $user_ids.") AND
+                        relation_type<>" . COURSE_RELATION_TYPE_RRHH." AND
+                        c_id = '" . $course_id."'";
             Database::query($sql);
 
             // add event to system log
@@ -603,7 +603,7 @@ 
 
         // A preliminary check whether the user has bben already registered on the platform.
         if (Database::num_rows(Database::query(
-                "SELECT status FROM " . Database::get_main_table(TABLE_MAIN_USER) . "
+                "SELECT status FROM ".Database::get_main_table(TABLE_MAIN_USER)."
                 WHERE user_id = '$user_id' ")) == 0
         ) {
             return false; // The user has not been registered to the platform.
@@ -613,8 +613,8 @@ 
 
         if (empty($session_id)) {
             if (Database::num_rows(Database::query("
-                    SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
-                    WHERE user_id = '$user_id' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND c_id = '$courseId'")) > 0
+                    SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)."
+                    WHERE user_id = '$user_id' AND relation_type<>".COURSE_RELATION_TYPE_RRHH." AND c_id = '$courseId'")) > 0
             ) {
                 // The user has been already subscribed to the course.
                 return false;
@@ -736,7 +736,7 @@ 
         $courseId = $courseInfo['real_id'];
 
         // Check in advance whether the user has already been registered on the platform.
-        $sql = "SELECT status FROM " . $user_table . " WHERE user_id = $user_id ";
+        $sql = "SELECT status FROM ".$user_table." WHERE user_id = $user_id ";
         if (Database::num_rows(Database::query($sql)) == 0) {
             if ($debug) {
                 error_log('The user has not been registered to the platform');
@@ -748,7 +748,7 @@ 
         $sql = "SELECT * FROM $course_user_table
                 WHERE
                     user_id = $user_id AND
-                    relation_type <> " . COURSE_RELATION_TYPE_RRHH . " AND
+                    relation_type <> ".COURSE_RELATION_TYPE_RRHH." AND
                     c_id = $courseId";
         if (Database::num_rows(Database::query($sql)) > 0) {
             if ($debug) {
@@ -760,7 +760,7 @@ 
         if (!api_is_course_admin()) {
             // Check in advance whether subscription is allowed or not for this course.
             $sql = "SELECT code, visibility FROM $course_table
-                    WHERE id = $courseId AND subscribe = '" . SUBSCRIBE_NOT_ALLOWED . "'";
+                    WHERE id = $courseId AND subscribe = '".SUBSCRIBE_NOT_ALLOWED."'";
             if (Database::num_rows(Database::query($sql)) > 0) {
                 if ($debug) {
                     error_log('Subscription is not allowed for this course');
@@ -819,7 +819,7 @@ 
     {
         $wanted_course_code = Database::escape_string($wanted_course_code);
         $sql = "SELECT COUNT(*) as number
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE)."
                 WHERE code = '$wanted_course_code' OR visual_code = '$wanted_course_code'";
         $result = Database::fetch_array(Database::query($sql));
 
@@ -1005,7 +1005,7 @@ 
         $sql = "SELECT * FROM $table
                 WHERE
                     user_id = $userId AND
-                    relation_type = " . COURSE_RELATION_TYPE_RRHH . " AND
+                    relation_type = ".COURSE_RELATION_TYPE_RRHH." AND
                     c_id = $courseId";
 
         $result = Database::fetch_array(Database::query($sql));
@@ -1044,13 +1044,13 @@ 
                 return false;
             }
             $courseId = $courseInfo['real_id'];
-            $condition_course = ' AND c_id = ' . $courseId;
+            $condition_course = ' AND c_id = '.$courseId;
         }
 
-        $sql = "SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
+        $sql = "SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
                 WHERE
                     user_id = $user_id AND
-                    relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
+                    relation_type<>".COURSE_RELATION_TYPE_RRHH."
                     $condition_course ";
 
         $result = Database::fetch_array(Database::query($sql));
@@ -1066,20 +1066,20 @@ 
         }
 
         $tableSessionCourseUser = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-        $sql = 'SELECT 1 FROM ' . $tableSessionCourseUser .
-            ' WHERE user_id = ' . $user_id . ' ' . $condition_course;
+        $sql = 'SELECT 1 FROM '.$tableSessionCourseUser.
+            ' WHERE user_id = '.$user_id.' '.$condition_course;
         if (Database::num_rows(Database::query($sql)) > 0) {
             return true;
         }
 
-        $sql = 'SELECT 1 FROM ' . $tableSessionCourseUser .
-            ' WHERE user_id = ' . $user_id . ' AND status=2 ' . $condition_course;
+        $sql = 'SELECT 1 FROM '.$tableSessionCourseUser.
+            ' WHERE user_id = '.$user_id.' AND status=2 '.$condition_course;
         if (Database::num_rows(Database::query($sql)) > 0) {
             return true;
         }
 
-        $sql = 'SELECT 1 FROM ' . Database::get_main_table(TABLE_MAIN_SESSION) .
-            ' WHERE id = ' . $session_id . ' AND id_coach=' . $user_id;
+        $sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_SESSION).
+            ' WHERE id = '.$session_id.' AND id_coach='.$user_id;
 
         if (Database::num_rows(Database::query($sql)) > 0) {
             return true;
@@ -1106,8 +1106,8 @@ 
         $courseId = $courseInfo['real_id'];
 
         $result = Database::query(
-            'SELECT status FROM ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) .
-            ' WHERE c_id = ' . $courseId . ' AND user_id = ' . $user_id . ''
+            'SELECT status FROM '.Database::get_main_table(TABLE_MAIN_COURSE_USER).
+            ' WHERE c_id = '.$courseId.' AND user_id = '.$user_id.''
         );
 
         if (Database::num_rows($result) > 0) {
@@ -1137,12 +1137,12 @@ 
             $result = Database::fetch_array(
                 Database::query(
                     "SELECT *
-                    FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . " course
-                    LEFT JOIN " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " course_user
+                    FROM " . Database::get_main_table(TABLE_MAIN_COURSE)." course
+                    LEFT JOIN " . Database::get_main_table(TABLE_MAIN_COURSE_USER)." course_user
                     ON course.id = course_user.c_id
                     WHERE
                         course_user.user_id = '$user_id' AND
-                        course_user.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        course_user.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         ( course.id = '$courseId')"
                 )
             );
@@ -1156,8 +1156,8 @@ 
 
         // A user?
         if (Database::num_rows(Database::query("SELECT user_id
-                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
-                WHERE session_id='" . $session_id . "'
+                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
+                WHERE session_id='" . $session_id."'
                 AND user_id ='$user_id'"))
         ) {
             return true;
@@ -1165,8 +1165,8 @@ 
 
         // A course coach?
         if (Database::num_rows(Database::query("SELECT user_id
-                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . "
-                WHERE session_id='" . $session_id . "'
+                FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)."
+                WHERE session_id='" . $session_id."'
                 AND user_id = '$user_id' AND status = 2
                 AND c_id ='$courseId'"))
         ) {
@@ -1175,8 +1175,8 @@ 
 
         // A session coach?
         if (Database::num_rows(Database::query("SELECT id_coach
-                FROM " . Database::get_main_table(TABLE_MAIN_SESSION) . " AS session
-                WHERE session.id='" . $session_id . "'
+                FROM " . Database::get_main_table(TABLE_MAIN_SESSION)." AS session
+                WHERE session.id='" . $session_id."'
                 AND id_coach='$user_id'"))
         ) {
             return true;
@@ -1244,7 +1244,7 @@ 
         // we have to check if it is a valid field that can be sorted on
         if (!strstr($order_by, 'ORDER BY')) {
             if (!empty($order_by)) {
-                $order_by = 'ORDER BY ' . $order_by;
+                $order_by = 'ORDER BY '.$order_by;
             } else {
                 $order_by = '';
             }
@@ -1276,11 +1276,11 @@ 
             if (!empty($courseCodeList)) {
                 $courseCodeListForSession = array_map(array('Database', 'escape_string'), $courseCodeList);
                 $courseCodeListForSession = implode('","', $courseCodeListForSession);
-                $courseCondition = ' course.code IN ("' . $courseCodeListForSession . '")  ';
+                $courseCondition = ' course.code IN ("'.$courseCodeListForSession.'")  ';
             }
 
-            $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
-            $sql .= " LEFT JOIN ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " as session_course_user
+            $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
+            $sql .= " LEFT JOIN ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." as session_course_user
                       ON
                         user.user_id = session_course_user.user_id AND
                         $sessionCondition
@@ -1322,14 +1322,14 @@ 
                 }
             }
 
-            $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
+            $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user
                         ON user.user_id = course_rel_user.user_id AND
-                        course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH . '  ';
+                        course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH.'  ';
             $sql .= " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
 
             if (!empty($course_code)) {
-                $sql .= ' AND course_rel_user.c_id="' . $courseId . '"';
+                $sql .= ' AND course_rel_user.c_id="'.$courseId.'"';
             }
             $where[] = ' course_rel_user.c_id IS NOT NULL ';
 
@@ -1341,7 +1341,7 @@ 
 
         $multiple_access_url = api_get_multiple_access_url();
         if ($multiple_access_url) {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER) . ' au
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au
                       ON (au.user_id = user.user_id) ';
         }
 
@@ -1361,7 +1361,7 @@ 
             }
         }
 
-        $sql .= ' WHERE ' . $filter_by_status_condition . ' ' . implode(' OR ', $where);
+        $sql .= ' WHERE '.$filter_by_status_condition.' '.implode(' OR ', $where);
 
         if ($multiple_access_url) {
             $current_access_url_id = api_get_current_access_url_id();
@@ -1383,15 +1383,15 @@ 
         if (!empty($userIdList)) {
             $userIdList = array_map('intval', $userIdList);
             $userIdList = implode('","', $userIdList);
-            $sql .= ' AND user.user_id IN ("' . $userIdList . '")';
+            $sql .= ' AND user.user_id IN ("'.$userIdList.'")';
         }
 
         if (isset($filterByActive)) {
             $filterByActive = intval($filterByActive);
-            $sql .= ' AND user.active = ' . $filterByActive;
+            $sql .= ' AND user.active = '.$filterByActive;
         }
 
-        $sql .= ' ' . $order_by . ' ' . $limit;
+        $sql .= ' '.$order_by.' '.$limit;
 
         $rs = Database::query($sql);
         $users = array();
@@ -1548,7 +1548,7 @@ 
                             )
                         );
                         $report_info['progress_100'] = $progress == 100 ? Display::label(get_lang('Yes'), 'success') : Display::label(get_lang('No'));
-                        $report_info['progress'] = $progress . "%";
+                        $report_info['progress'] = $progress."%";
 
                         foreach ($extra_fields as $extra) {
                             $user_data = UserManager::get_extra_user_data_by_field($user['user_id'], $extra['1']);
@@ -1617,32 +1617,32 @@ 
         $courseInfo = api_get_course_info($course_code);
         $courseId = $courseInfo['real_id'];
 
-        $sql = 'SELECT DISTINCT count(*) as count  FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user ';
+        $sql = 'SELECT DISTINCT count(*) as count  FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user ';
         $where = array();
         if (!empty($session_id)) {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . ' as session_course_user
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).' as session_course_user
                       ON
                         user.user_id = session_course_user.user_id AND
-                        session_course_user.c_id = "' . $courseId . '" AND
+                        session_course_user.c_id = "' . $courseId.'" AND
                         session_course_user.session_id  = ' . $session_id;
 
             $where[] = ' session_course_user.c_id IS NOT NULL ';
         } else {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_COURSE_USER).' as course_rel_user
                         ON
                             user.user_id = course_rel_user.user_id AND
-                            course_rel_user.relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' AND
-                            course_rel_user.c_id = ' . $courseId ;
+                            course_rel_user.relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND
+                            course_rel_user.c_id = ' . $courseId;
             $where[] = ' course_rel_user.c_id IS NOT NULL ';
         }
 
         $multiple_access_url = api_get_multiple_access_url();
         if ($multiple_access_url) {
-            $sql .= ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER) . '  au
+            $sql .= ' LEFT JOIN '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).'  au
                       ON (au.user_id = user.user_id) ';
         }
 
-        $sql .= ' WHERE ' . implode(' OR ', $where);
+        $sql .= ' WHERE '.implode(' OR ', $where);
 
         if ($multiple_access_url) {
             $current_access_url_id = api_get_current_access_url_id();
@@ -1678,8 +1678,8 @@ 
         $users = array();
 
         // We get the coach for the given course in a given session.
-        $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) .
-               ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
+        $sql = 'SELECT user_id FROM '.Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER).
+               ' WHERE session_id ="'.$session_id.'" AND c_id="'.$courseId.'" AND status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $user_info = api_get_user_info($user['user_id']);
@@ -1691,7 +1691,7 @@ 
 
         $table = Database::get_main_table(TABLE_MAIN_SESSION);
         // We get the session coach.
-        $sql = 'SELECT id_coach FROM ' . $table . ' WHERE id=' . $session_id;
+        $sql = 'SELECT id_coach FROM '.$table.' WHERE id='.$session_id;
         $rs = Database::query($sql);
         $session_id_coach = Database::result($rs, 0, 'id_coach');
         $user_info = api_get_user_info($session_id_coach);
@@ -1767,11 +1767,11 @@ 
             $joinSession = "";
             //Session creation date
             if (!empty($date_from) && !empty($date_to)) {
-                $joinSession = "INNER JOIN " . Database::get_main_table(TABLE_MAIN_SESSION) . " s";
+                $joinSession = "INNER JOIN ".Database::get_main_table(TABLE_MAIN_SESSION)." s";
             }
 
             $sql_query = "SELECT *
-                          FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " scu
+                          FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." scu
                           $joinSession
                           INNER JOIN $userTable u ON scu.user_id = u.user_id
                           WHERE scu.c_id = '$courseId' AND scu.status <> 2";
@@ -1783,11 +1783,11 @@ 
             }
 
             if ($session_id != 0) {
-                $sql_query .= ' AND scu.session_id = ' . $session_id;
+                $sql_query .= ' AND scu.session_id = '.$session_id;
             }
 
             if (!$includeInvitedUsers) {
-                $sql_query .= " AND u.status != " . INVITEE;
+                $sql_query .= " AND u.status != ".INVITEE;
             }
 
             $rs = Database::query($sql_query);
@@ -1821,8 +1821,8 @@ 
                     u.email,
                     u.username,
                     u.status
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " cu
-                INNER JOIN " . Database::get_main_table(TABLE_MAIN_USER) . " u
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER)." cu
+                INNER JOIN " . Database::get_main_table(TABLE_MAIN_USER)." u
                 ON (cu.user_id = u.id)
                 WHERE
                     cu.c_id = $courseId AND
@@ -1860,7 +1860,7 @@ 
                     $teacher['lastname']
                 );
                 if ($add_link_to_profile) {
-                    $url = api_get_path(WEB_AJAX_PATH) . 'user_manager.ajax.php?a=get_user_popup&user_id=' . $teacher['user_id'];
+                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$teacher['user_id'];
                     $teacher_name = Display::url(
                         $teacher_name,
                         $url,
@@ -1874,13 +1874,13 @@ 
             }
 
             if (!empty($list)) {
-                if ($orderList === true){
+                if ($orderList === true) {
                     $html .= '<ul class="user-teacher">';
-                    foreach ($list as $teacher){
-                        $html .= Display::tag('li', Display::return_icon('teacher.png', $teacher, null, ICON_SIZE_TINY) . ' ' . $teacher);
+                    foreach ($list as $teacher) {
+                        $html .= Display::tag('li', Display::return_icon('teacher.png', $teacher, null, ICON_SIZE_TINY).' '.$teacher);
                     }
                     $html .= '</ul>';
-                }else{
+                } else {
                     $html .= array_to_string($list, $separator);
                 }
             }
@@ -1959,7 +1959,7 @@ 
             foreach ($coachs_course as $coach_course) {
                 $coach_name = api_get_person_name($coach_course['firstname'], $coach_course['lastname']);
                 if ($add_link_to_profile) {
-                    $url = api_get_path(WEB_AJAX_PATH) . 'user_manager.ajax.php?a=get_user_popup&user_id=' . $coach_course['user_id'];
+                    $url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coach_course['user_id'];
                     $coach_name = Display::url(
                         $coach_name,
                         $url,
@@ -1975,10 +1975,10 @@ 
         $coaches_to_string = null;
 
         if (!empty($course_coachs)) {
-            if ($orderList === true){
+            if ($orderList === true) {
                 $html .= '<ul class="user-coachs">';
-                    foreach ($course_coachs as $coachs){
-                        $html .= Display::tag('li', Display::return_icon('teacher.png', $coachs, null, ICON_SIZE_TINY) . ' ' . $coachs);
+                    foreach ($course_coachs as $coachs) {
+                        $html .= Display::tag('li', Display::return_icon('teacher.png', $coachs, null, ICON_SIZE_TINY).' '.$coachs);
                     }
                 $html .= '</ul>';
             } else {
@@ -2033,20 +2033,20 @@ 
         }
 
         $group_list = array();
-        $session_id != 0 ? $session_condition = ' WHERE g.session_id IN(1,' . intval($session_id) . ')' : $session_condition = ' WHERE g.session_id = 0';
+        $session_id != 0 ? $session_condition = ' WHERE g.session_id IN(1,'.intval($session_id).')' : $session_condition = ' WHERE g.session_id = 0';
 
         if ($in_get_empty_group == 0) {
             // get only groups that are not empty
             $sql = "SELECT DISTINCT g.id, g.name
-                    FROM " . Database::get_course_table(TABLE_GROUP) . " AS g
-                    INNER JOIN " . Database::get_course_table(TABLE_GROUP_USER) . " gu
+                    FROM " . Database::get_course_table(TABLE_GROUP)." AS g
+                    INNER JOIN " . Database::get_course_table(TABLE_GROUP_USER)." gu
                     ON (g.id = gu.group_id AND g.c_id = $course_id AND gu.c_id = $course_id)
                     $session_condition
                     ORDER BY g.name";
         } else {
             // get all groups even if they are empty
             $sql = "SELECT g.id, g.name
-                    FROM " . Database::get_course_table(TABLE_GROUP) . " AS g
+                    FROM " . Database::get_course_table(TABLE_GROUP)." AS g
                     $session_condition
                     AND c_id = $course_id";
         }
@@ -2101,7 +2101,7 @@ 
         $table_stats_uploads = Database::get_main_table(TABLE_STATISTIC_TRACK_E_UPLOADS);
 
         $codeFiltered = Database::escape_string($code);
-        $sql = "SELECT * FROM $table_course WHERE code='" . $codeFiltered . "'";
+        $sql = "SELECT * FROM $table_course WHERE code='".$codeFiltered."'";
         $res = Database::query($sql);
 
         if (Database::num_rows($res) == 0) {
@@ -2109,7 +2109,7 @@ 
         }
 
         $sql = "SELECT * FROM $table_course
-                WHERE code = '" . $codeFiltered . "'";
+                WHERE code = '".$codeFiltered."'";
         $res = Database::query($sql);
         $course = Database::fetch_array($res);
         $courseId = $course['id'];
@@ -2154,34 +2154,34 @@ 
                 }
             }
 
-            $course_dir = api_get_path(SYS_COURSE_PATH) . $course['directory'];
-            $archive_dir = api_get_path(SYS_ARCHIVE_PATH) . $course['directory'] . '_' . time();
+            $course_dir = api_get_path(SYS_COURSE_PATH).$course['directory'];
+            $archive_dir = api_get_path(SYS_ARCHIVE_PATH).$course['directory'].'_'.time();
             if (is_dir($course_dir)) {
                 rename($course_dir, $archive_dir);
             }
 
             // Unsubscribe all users from the course
-            $sql = "DELETE FROM $table_course_user WHERE c_id='" . $courseId . "'";
+            $sql = "DELETE FROM $table_course_user WHERE c_id='".$courseId."'";
             Database::query($sql);
             // Delete the course from the sessions tables
-            $sql = "DELETE FROM $table_session_course WHERE c_id='" . $courseId . "'";
+            $sql = "DELETE FROM $table_session_course WHERE c_id='".$courseId."'";
             Database::query($sql);
-            $sql = "DELETE FROM $table_session_course_user WHERE c_id='" . $courseId . "'";
+            $sql = "DELETE FROM $table_session_course_user WHERE c_id='".$courseId."'";
             Database::query($sql);
 
             // Delete from Course - URL
-            $sql = "DELETE FROM $table_course_rel_url WHERE c_id = '" . $courseId. "'";
+            $sql = "DELETE FROM $table_course_rel_url WHERE c_id = '".$courseId."'";
             Database::query($sql);
 
-            $sql = 'SELECT survey_id FROM ' . $table_course_survey . ' WHERE course_code="' . $codeFiltered . '"';
+            $sql = 'SELECT survey_id FROM '.$table_course_survey.' WHERE course_code="'.$codeFiltered.'"';
             $result_surveys = Database::query($sql);
             while ($surveys = Database::fetch_array($result_surveys)) {
                 $survey_id = $surveys[0];
-                $sql = 'DELETE FROM ' . $table_course_survey_question . ' WHERE survey_id="' . $survey_id . '"';
+                $sql = 'DELETE FROM '.$table_course_survey_question.' WHERE survey_id="'.$survey_id.'"';
                 Database::query($sql);
-                $sql = 'DELETE FROM ' . $table_course_survey_question_option . ' WHERE survey_id="' . $survey_id . '"';
+                $sql = 'DELETE FROM '.$table_course_survey_question_option.' WHERE survey_id="'.$survey_id.'"';
                 Database::query($sql);
-                $sql = 'DELETE FROM ' . $table_course_survey . ' WHERE survey_id="' . $survey_id . '"';
+                $sql = 'DELETE FROM '.$table_course_survey.' WHERE survey_id="'.$survey_id.'"';
                 Database::query($sql);
             }
 
@@ -2214,7 +2214,7 @@ 
             Database::query($sql);
 
             // Delete the course from the database
-            $sql = "DELETE FROM $table_course WHERE code = '" . $codeFiltered . "'";
+            $sql = "DELETE FROM $table_course WHERE code = '".$codeFiltered."'";
             Database::query($sql);
 
             // delete extra course fields
@@ -2260,15 +2260,15 @@ 
                 while ($row = Database::fetch_array($res_table, 'ASSOC')) {
                     $row_to_save = array();
                     foreach ($row as $key => $value) {
-                        $row_to_save[$key] = $key . "='" . Database::escape_string($row[$key]) . "'";
+                        $row_to_save[$key] = $key."='".Database::escape_string($row[$key])."'";
                     }
-                    $sql_dump .= "\nINSERT INTO $table SET " . implode(', ', $row_to_save) . ';';
+                    $sql_dump .= "\nINSERT INTO $table SET ".implode(', ', $row_to_save).';';
                 }
             }
         }
 
-        if (is_dir(api_get_path(SYS_COURSE_PATH) . $course['directory'])) {
-            $file_name = api_get_path(SYS_COURSE_PATH) . $course['directory'] . '/mysql_dump.sql';
+        if (is_dir(api_get_path(SYS_COURSE_PATH).$course['directory'])) {
+            $file_name = api_get_path(SYS_COURSE_PATH).$course['directory'].'/mysql_dump.sql';
             $handle = fopen($file_name, 'a+');
             if ($handle !== false) {
                 fwrite($handle, $sql_dump);
@@ -2296,13 +2296,13 @@ 
         $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
         $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 
-        $course_title = Database::result(Database::query('SELECT title FROM ' . $TABLECOURSE . ' WHERE code="' . $course_code . '"'),
+        $course_title = Database::result(Database::query('SELECT title FROM '.$TABLECOURSE.' WHERE code="'.$course_code.'"'),
             0, 0);
 
         $sql = 'SELECT course.code as code, course.title as title, cu.sort as sort
-                FROM ' . $TABLECOURSUSER . ' as cu, ' . $TABLECOURSE . ' as course
-                WHERE   course.id = cu.c_id AND user_id = "' . $user_id . '" AND
-                        cu.relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' AND
+                FROM ' . $TABLECOURSUSER.' as cu, '.$TABLECOURSE.' as course
+                WHERE   course.id = cu.c_id AND user_id = "' . $user_id.'" AND
+                        cu.relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND
                         user_course_cat = 0
                 ORDER BY cu.sort';
         $result = Database::query($sql);
@@ -2321,21 +2321,21 @@ 
                     $course_found = true;
                     $course_sort = $courses['sort'];
                     if ($counter == 0) {
-                        $sql = 'UPDATE ' . $TABLECOURSUSER . '
+                        $sql = 'UPDATE '.$TABLECOURSUSER.'
                                 SET sort = sort+1
                                 WHERE
-                                    user_id= "' . $user_id . '" AND
-                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH . '
+                                    user_id= "' . $user_id.'" AND
+                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH.'
                                     AND user_course_cat="0"
-                                    AND sort > "' . $course_sort . '"';
+                                    AND sort > "' . $course_sort.'"';
                         $course_sort++;
                     } else {
-                        $sql = 'UPDATE ' . $TABLECOURSUSER . ' SET sort = sort+1
+                        $sql = 'UPDATE '.$TABLECOURSUSER.' SET sort = sort+1
                                 WHERE
-                                    user_id= "' . $user_id . '" AND
-                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' AND
+                                    user_id= "' . $user_id.'" AND
+                                    relation_type<>' . COURSE_RELATION_TYPE_RRHH.' AND
                                     user_course_cat="0" AND
-                                    sort >= "' . $course_sort . '"';
+                                    sort >= "' . $course_sort.'"';
                     }
                     Database::query($sql);
                     break;
@@ -2348,9 +2348,9 @@ 
 
             // We must register the course in the beginning of the list
             if (!$course_found) {
-                $course_sort = Database::result(Database::query('SELECT min(sort) as min_sort FROM ' . $TABLECOURSUSER . ' WHERE user_id="' . $user_id . '" AND user_course_cat="0"'),
+                $course_sort = Database::result(Database::query('SELECT min(sort) as min_sort FROM '.$TABLECOURSUSER.' WHERE user_id="'.$user_id.'" AND user_course_cat="0"'),
                     0, 0);
-                Database::query('UPDATE ' . $TABLECOURSUSER . ' SET sort = sort+1 WHERE user_id= "' . $user_id . '" AND user_course_cat="0"');
+                Database::query('UPDATE '.$TABLECOURSUSER.' SET sort = sort+1 WHERE user_id= "'.$user_id.'" AND user_course_cat="0"');
             }
         }
         return $course_sort;
@@ -2365,11 +2365,11 @@ 
     public static function course_exists($course_code, $accept_virtual = false)
     {
         if ($accept_virtual === true) {
-            $sql = 'SELECT 1 FROM ' . Database::get_main_table(TABLE_MAIN_COURSE) . '
-                    WHERE code="' . Database::escape_string($course_code) . '" OR visual_code="' . Database::escape_string($course_code) . '"';
+            $sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_COURSE).'
+                    WHERE code="' . Database::escape_string($course_code).'" OR visual_code="'.Database::escape_string($course_code).'"';
         } else {
-            $sql = 'SELECT 1 FROM ' . Database::get_main_table(TABLE_MAIN_COURSE) . '
-                    WHERE code="' . Database::escape_string($course_code) . '"';
+            $sql = 'SELECT 1 FROM '.Database::get_main_table(TABLE_MAIN_COURSE).'
+                    WHERE code="' . Database::escape_string($course_code).'"';
         }
 
         return Database::num_rows(Database::query($sql));
@@ -2395,7 +2395,7 @@ 
         $student = api_get_user_info($user_id);
 
         $name_course = $information['title'];
-        $sql = "SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " WHERE c_id ='" . $courseId . "'";
+        $sql = "SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)." WHERE c_id ='".$courseId."'";
 
         // TODO: Ivan: This is a mistake, please, have a look at it. Intention here is diffcult to be guessed.
         //if ($send_to_tutor_also = true)
@@ -2410,18 +2410,18 @@ 
         while ($row = Database::fetch_array($result)) {
             $tutor = api_get_user_info($row['user_id']);
             $emailto = $tutor['email'];
-            $emailsubject = get_lang('NewUserInTheCourse') . ': ' . $name_course;
-            $emailbody = get_lang('Dear') . ': ' . api_get_person_name($tutor['firstname'], $tutor['lastname']) . "\n";
-            $emailbody .= get_lang('MessageNewUserInTheCourse') . ': ' . $name_course . "\n";
-            $emailbody .= get_lang('UserName') . ': ' . $student['username'] . "\n";
+            $emailsubject = get_lang('NewUserInTheCourse').': '.$name_course;
+            $emailbody = get_lang('Dear').': '.api_get_person_name($tutor['firstname'], $tutor['lastname'])."\n";
+            $emailbody .= get_lang('MessageNewUserInTheCourse').': '.$name_course."\n";
+            $emailbody .= get_lang('UserName').': '.$student['username']."\n";
             if (api_is_western_name_order()) {
-                $emailbody .= get_lang('FirstName') . ': ' . $student['firstname'] . "\n";
-                $emailbody .= get_lang('LastName') . ': ' . $student['lastname'] . "\n";
+                $emailbody .= get_lang('FirstName').': '.$student['firstname']."\n";
+                $emailbody .= get_lang('LastName').': '.$student['lastname']."\n";
             } else {
-                $emailbody .= get_lang('LastName') . ': ' . $student['lastname'] . "\n";
-                $emailbody .= get_lang('FirstName') . ': ' . $student['firstname'] . "\n";
+                $emailbody .= get_lang('LastName').': '.$student['lastname']."\n";
+                $emailbody .= get_lang('FirstName').': '.$student['firstname']."\n";
             }
-            $emailbody .= get_lang('Email') . ': <a href="mailto:' . $student['email'] . '">' . $student['email'] ."</a>\n\n";
+            $emailbody .= get_lang('Email').': <a href="mailto:'.$student['email'].'">'.$student['email']."</a>\n\n";
             $recipient_name = api_get_person_name($tutor['firstname'], $tutor['lastname'], null,
                 PERSON_NAME_EMAIL_ADDRESS);
             $sender_name = api_get_person_name(api_get_setting('administratorName'),
@@ -2523,9 +2523,9 @@ 
 
             $with_special_courses = $without_special_courses = '';
             if (!empty($special_course_list)) {
-                $sc_string = '"' . implode('","', $special_course_list) . '"';
-                $with_special_courses = ' course.code IN (' . $sc_string . ')';
-                $without_special_courses = ' AND course.code NOT IN (' . $sc_string . ')';
+                $sc_string = '"'.implode('","', $special_course_list).'"';
+                $with_special_courses = ' course.code IN ('.$sc_string.')';
+                $without_special_courses = ' AND course.code NOT IN ('.$sc_string.')';
             }
 
             if (!empty($with_special_courses)) {
@@ -2569,8 +2569,8 @@ 
 
         if ($include_sessions === true) {
             $sql = "SELECT DISTINCT(c.code), c.id as real_id
-                    FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . " s,
-                    " . Database::get_main_table(TABLE_MAIN_COURSE) . " c
+                    FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." s,
+                    " . Database::get_main_table(TABLE_MAIN_COURSE)." c
                     WHERE user_id = $user_id AND s.c_id = c.id";
             $r = Database::query($sql);
             while ($row = Database::fetch_array($r, 'ASSOC')) {
@@ -2591,7 +2591,7 @@ 
     public static function get_course_id_from_path($path)
     {
         $path = Database::escape_string(str_replace('.', '', str_replace('/', '', $path)));
-        $res = Database::query("SELECT code FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
+        $res = Database::query("SELECT code FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
                 WHERE directory LIKE BINARY '$path'");
         if ($res === false) {
             return false;
@@ -2613,8 +2613,8 @@ 
     public static function get_courses_info_from_visual_code($code)
     {
         $result = array();
-        $sql_result = Database::query("SELECT * FROM " . Database::get_main_table(TABLE_MAIN_COURSE) . "
-                WHERE visual_code = '" . Database::escape_string($code) . "'");
+        $sql_result = Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
+                WHERE visual_code = '" . Database::escape_string($code)."'");
         while ($virtual_course = Database::fetch_array($sql_result)) {
             $result[] = $virtual_course;
         }
@@ -2630,10 +2630,10 @@ 
     public static function get_emails_of_tutors_to_course($courseId)
     {
         $list = array();
-        $res = Database::query("SELECT user_id FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "
-                WHERE c_id ='" . intval($courseId) . "' AND status=1");
+        $res = Database::query("SELECT user_id FROM ".Database::get_main_table(TABLE_MAIN_COURSE_USER)."
+                WHERE c_id ='" . intval($courseId)."' AND status=1");
         while ($list_users = Database::fetch_array($res)) {
-            $result = Database::query("SELECT * FROM " . Database::get_main_table(TABLE_MAIN_USER) . "
+            $result = Database::query("SELECT * FROM ".Database::get_main_table(TABLE_MAIN_USER)."
                     WHERE user_id=" . $list_users['user_id']);
             while ($row_user = Database::fetch_array($result)) {
                 $name_teacher = api_get_person_name($row_user['firstname'], $row_user['lastname']);
@@ -2676,7 +2676,7 @@ 
             }
 
             $sql = "SELECT firstname, lastname, email FROM $tbl_user
-                    WHERE user_id IN (" . implode(",", $user_ids) . ")";
+                    WHERE user_id IN (".implode(",", $user_ids).")";
             $rs_user = Database::query($sql);
 
             while ($row_emails = Database::fetch_array($rs_user)) {
@@ -2722,9 +2722,9 @@ 
      */
     public static function update_attribute($id, $name, $value)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $table = Database::get_main_table(TABLE_MAIN_COURSE);
-        $sql = "UPDATE $table SET $name = '" . Database::escape_string($value) . "'
+        $sql = "UPDATE $table SET $name = '".Database::escape_string($value)."'
                 WHERE id = '$id';";
         return Database::query($sql);
     }
@@ -2739,7 +2739,7 @@ 
      */
     public static function update_attributes($id, $attributes)
     {
-        $id = (int)$id;
+        $id = (int) $id;
         $table = Database::get_main_table(TABLE_MAIN_COURSE);
         $sql = "UPDATE $table SET ";
         $i = 0;
@@ -2748,7 +2748,7 @@ 
                 if ($i > 0) {
                     $sql .= ", ";
                 }
-                $sql .= " $name = '" . Database::escape_string($value) . "'";
+                $sql .= " $name = '".Database::escape_string($value)."'";
                 $i++;
             }
         }
@@ -2785,9 +2785,9 @@ 
     {
         return Database::result(
             Database::query('SELECT  sc.id session_category
-                FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY) . ' sc
-                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION) . ' s
-                ON sc.id=s.session_category_id WHERE s.id="' . Database::escape_string($session_id) . '"'),
+                FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY).' sc
+                INNER JOIN ' . Database::get_main_table(TABLE_MAIN_SESSION).' s
+                ON sc.id=s.session_category_id WHERE s.id="' . Database::escape_string($session_id).'"'),
             0,
             'session_category'
         );
@@ -2830,13 +2830,13 @@ 
                 $data .= '<div class="sectiontitle">';
                 if (api_is_allowed_to_edit() && $action_show) {
                     //delete
-                    $data .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=delete&description_id=' . $description->id . '" onclick="javascript:if(!confirm(\'' . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),
-                                ENT_QUOTES, $charset)) . '\')) return false;">';
+                    $data .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&description_id='.$description->id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),
+                                ENT_QUOTES, $charset)).'\')) return false;">';
                     $data .= Display::return_icon('delete.gif', get_lang('Delete'),
                         array('style' => 'vertical-align:middle;float:right;'));
                     $data .= '</a> ';
                     //edit
-                    $data .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&description_id=' . $description->id . '">';
+                    $data .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&description_id='.$description->id.'">';
                     $data .= Display::return_icon('edit.png', get_lang('Edit'),
                         array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
                     $data .= '</a> ';
@@ -2848,7 +2848,7 @@ 
                 $data .= '</div>';
             }
         } else {
-            $data .= '<em>' . get_lang('ThisCourseDescriptionIsEmpty') . '</em>';
+            $data .= '<em>'.get_lang('ThisCourseDescriptionIsEmpty').'</em>';
         }
 
         return $data;
@@ -2915,11 +2915,11 @@ 
                     ON (a.c_id = s.c_id)
                     WHERE
                         user_id = $hr_manager_id AND
-                        relation_type=" . COURSE_RELATION_TYPE_RRHH . " AND
-                        access_url_id = " . api_get_current_access_url_id() . "";
+                        relation_type=".COURSE_RELATION_TYPE_RRHH." AND
+                        access_url_id = " . api_get_current_access_url_id()."";
         } else {
             $sql = "SELECT c_id FROM $tbl_course_rel_user
-                    WHERE user_id = $hr_manager_id AND relation_type=" . COURSE_RELATION_TYPE_RRHH . " ";
+                    WHERE user_id = $hr_manager_id AND relation_type=".COURSE_RELATION_TYPE_RRHH." ";
         }
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
@@ -2928,7 +2928,7 @@ 
                         WHERE
                             c_id = '{$row['c_id']}' AND
                             user_id = $hr_manager_id AND
-                            relation_type=" . COURSE_RELATION_TYPE_RRHH . " ";
+                            relation_type=".COURSE_RELATION_TYPE_RRHH." ";
                 Database::query($sql);
             }
         }
@@ -2939,7 +2939,7 @@ 
                 $courseInfo = api_get_course_info($course_code);
                 $courseId = $courseInfo['real_id'];
                 $sql = "INSERT IGNORE INTO $tbl_course_rel_user(c_id, user_id, status, relation_type)
-                        VALUES($courseId, $hr_manager_id, '" . DRH . "', '" . COURSE_RELATION_TYPE_RRHH . "')";
+                        VALUES($courseId, $hr_manager_id, '".DRH."', '".COURSE_RELATION_TYPE_RRHH."')";
                 $result = Database::query($sql);
                 if (Database::affected_rows($result)) {
                     $affected_rows++;
@@ -3022,16 +3022,16 @@ 
             case COURSEMANAGER:
                 $whereConditions .= " AND cru.user_id = '$user_id'";
                 if (!$showAllAssignedCourses) {
-                    $whereConditions .= " AND status = " . COURSEMANAGER;
+                    $whereConditions .= " AND status = ".COURSEMANAGER;
                 } else {
-                    $whereConditions .= " AND relation_type = " . COURSE_RELATION_TYPE_COURSE_MANAGER;
+                    $whereConditions .= " AND relation_type = ".COURSE_RELATION_TYPE_COURSE_MANAGER;
                 }
                 break;
             case DRH:
                 $whereConditions .= " AND
                     cru.user_id = '$user_id' AND
-                    status = " . DRH . " AND
-                    relation_type = '" . COURSE_RELATION_TYPE_RRHH . "'
+                    status = ".DRH." AND
+                    relation_type = '" . COURSE_RELATION_TYPE_RRHH."'
                 ";
                 break;
         }
@@ -3052,7 +3052,7 @@ 
                 );
                 if (!empty($courseList)) {
                     $courseListToString = implode("','", array_keys($courseList));
-                    $whereConditions .= " AND c.id IN ('" . $courseListToString . "')";
+                    $whereConditions .= " AND c.id IN ('".$courseListToString."')";
                 }
                 $tableSessionRelCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
                 $orderBy = ' ORDER BY position';
@@ -3068,7 +3068,7 @@ 
                     INNER JOIN $tbl_course_rel_access_url a ON (a.c_id = c.id)
                     $extraInnerJoin
                 WHERE
-                    access_url_id = " . api_get_current_access_url_id() . "
+                    access_url_id = ".api_get_current_access_url_id()."
                     $whereConditions
                 $orderBy
                 ";
@@ -3128,10 +3128,10 @@ 
     {
         $course_info = api_get_course_info($course_code);
         // course path
-        $store_path = api_get_path(SYS_COURSE_PATH) . $course_info['path'];
+        $store_path = api_get_path(SYS_COURSE_PATH).$course_info['path'];
         // image name for courses
-        $course_image = $store_path . '/course-pic.png';
-        $course_medium_image = $store_path . '/course-pic85x85.png';
+        $course_image = $store_path.'/course-pic.png';
+        $course_medium_image = $store_path.'/course-pic85x85.png';
 
         if (file_exists($course_image)) {
             unlink($course_image);
@@ -3165,11 +3165,11 @@ 
     {
         $course_info = api_get_course_info($courseCode);
         // course path
-        $storePath = api_get_path(SYS_COURSE_PATH) . $course_info['path'];
+        $storePath = api_get_path(SYS_COURSE_PATH).$course_info['path'];
         // image name for courses
-        $courseImage = $storePath . '/course-pic.png';
-        $courseMediumImage = $storePath . '/course-pic85x85.png';
-        $courseSmallImage = $storePath . '/course-pic32.png';
+        $courseImage = $storePath.'/course-pic.png';
+        $courseMediumImage = $storePath.'/course-pic85x85.png';
+        $courseSmallImage = $storePath.'/course-pic32.png';
 
         if (file_exists($courseImage)) {
             unlink($courseImage);
@@ -3197,26 +3197,26 @@ 
 
         $notifications = isset($params['notifications']) ? $params['notifications'] : null;
 
-        $html .= '<h3>' . $params['title'] . $notifications . '</h3> ';
+        $html .= '<h3>'.$params['title'].$notifications.'</h3> ';
 
         if (isset($params['description'])) {
-            $html .= '<p>' . $params['description'] . '</p>';
+            $html .= '<p>'.$params['description'].'</p>';
         }
         if (!empty($params['subtitle'])) {
-            $html .= '<small>' . $params['subtitle'] . '</small>';
+            $html .= '<small>'.$params['subtitle'].'</small>';
         }
         if (!empty($params['teachers'])) {
-            $html .= '<h5 class="teacher">' . Display::return_icon('teacher.png', get_lang('Teacher'), array(),
-                    ICON_SIZE_TINY) . $params['teachers'] . '</h5>';
+            $html .= '<h5 class="teacher">'.Display::return_icon('teacher.png', get_lang('Teacher'), array(),
+                    ICON_SIZE_TINY).$params['teachers'].'</h5>';
         }
         if (!empty($params['coaches'])) {
-            $html .= '<h5 class="teacher">' . Display::return_icon('teacher.png', get_lang('Coach'), array(),
-                    ICON_SIZE_TINY) . $params['coaches'] . '</h5>';
+            $html .= '<h5 class="teacher">'.Display::return_icon('teacher.png', get_lang('Coach'), array(),
+                    ICON_SIZE_TINY).$params['coaches'].'</h5>';
         }
 
         $html .= '</div>';
         $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
-        $html .= '<div class="pull-right course-box-actions">' . $params['right_actions'] . '</div>';
+        $html .= '<div class="pull-right course-box-actions">'.$params['right_actions'].'</div>';
         $html .= '</div>';
         $html .= '</div>';
         return $html;
@@ -3232,11 +3232,11 @@ 
         $html = '';
         $html .= '<div class="row">';
         $html .= '<div class="col-md-2">';
-        if (!empty($params['link'])){
+        if (!empty($params['link'])) {
             $html .= '<a class="thumbnail" href="'.$params['link'].'">';
             $html .= $params['icon'];
             $html .= '</a>';
-        }else{
+        } else {
             $html .= $params['icon'];
         }
         $html .= '</div>';
@@ -3263,13 +3263,13 @@ 
         if ($is_sub_content) {
             $class = "course_item";
         }
-        $html .= '<div class="' . $class . '">';
+        $html .= '<div class="'.$class.'">';
         $html .= '<div class="panel-body">';
         $html .= '<div class="course-items">';
         $html .= ' <div class="row">';
         $html .= '<div class="col-md-2">';
         if (!empty($params['link'])) {
-            $html .= '<a class="thumbnail" href="' . $params['link'] . '">';
+            $html .= '<a class="thumbnail" href="'.$params['link'].'">';
             $html .= $params['icon'];
             $html .= '</a>';
         } else {
@@ -3282,25 +3282,25 @@ 
         $param_class = isset($params['class']) ? $params['class'] : '';
         $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : '';
 
-        $html .= '<div class="col-md-10 ' . $param_class . '">';
-        $html .= '<div class="pull-right">' . $params['right_actions'] . '</div>';
-        $html .= '<h4 class="course-items-title">' . $params['title'] . $notifications . '</h4> ';
+        $html .= '<div class="col-md-10 '.$param_class.'">';
+        $html .= '<div class="pull-right">'.$params['right_actions'].'</div>';
+        $html .= '<h4 class="course-items-title">'.$params['title'].$notifications.'</h4> ';
 
         if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
-            $html .= '<p class="description-session">' . $params['description'] . '</p>';
+            $html .= '<p class="description-session">'.$params['description'].'</p>';
         }
         if (!empty($params['subtitle'])) {
-            $html .= '<div class="subtitle-session">' . $params['subtitle'] . '</div>';
+            $html .= '<div class="subtitle-session">'.$params['subtitle'].'</div>';
         }
         if (!empty($params['teachers'])) {
-            $html .= '<h5 class="course-items-session">' .
-                    Display::return_icon('teacher.png', get_lang('Teacher'), array(), ICON_SIZE_TINY) .
-                $params['teachers'] . '</h5>';
+            $html .= '<h5 class="course-items-session">'.
+                    Display::return_icon('teacher.png', get_lang('Teacher'), array(), ICON_SIZE_TINY).
+                $params['teachers'].'</h5>';
         }
         if (!empty($params['coaches'])) {
-            $html .= '<h5 class="course-items-session">' .
-                Display::return_icon('teacher.png', get_lang('Coach'), array(), ICON_SIZE_TINY) .
-                $params['coaches'] . '</h5>';
+            $html .= '<h5 class="course-items-session">'.
+                Display::return_icon('teacher.png', get_lang('Coach'), array(), ICON_SIZE_TINY).
+                $params['coaches'].'</h5>';
         }
 
         $html .= '</div>';
@@ -3321,7 +3321,7 @@ 
      */
     public static function course_item_parent($main_content, $sub_content, $sub_sub_content = null)
     {
-        return '<div class="panel panel-default">' . $main_content . $sub_content . $sub_sub_content . '</div>';
+        return '<div class="panel panel-default">'.$main_content.$sub_content.$sub_sub_content.'</div>';
     }
 
     /**
@@ -3343,7 +3343,7 @@ 
 
         $with_special_courses = $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $with_special_courses = ' course.code IN ("' . implode('","', $special_course_list) . '")';
+            $with_special_courses = ' course.code IN ("'.implode('","', $special_course_list).'")';
         }
         $html = null;
         $courseCount = 0;
@@ -3394,14 +3394,14 @@ 
                     $params['right_actions'] = '';
                     if (api_is_platform_admin()) {
                         if ($load_dirs) {
-                            $params['right_actions'] .= '<a id="document_preview_' . $course['id'] . '_0" class="document_preview" href="javascript:void(0);">' .
+                            $params['right_actions'] .= '<a id="document_preview_'.$course['id'].'_0" class="document_preview" href="javascript:void(0);">'.
                                 Display::return_icon(
                                     'folder.png',
                                     get_lang('Documents'),
                                     array('align' => 'absmiddle'),
                                     ICON_SIZE_SMALL
                                 ).'</a>';
-                            $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' .
+                            $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.
                                 Display::return_icon(
                                     'edit.png',
                                     get_lang('Edit'),
@@ -3409,13 +3409,13 @@ 
                                     ICON_SIZE_SMALL
                                 ).'</a>';
                             $params['right_actions'] .= Display::div('', array(
-                                    'id' => 'document_result_' . $course['id'] . '_0',
+                                    'id' => 'document_result_'.$course['id'].'_0',
                                     'class' => 'document_preview_container'
                                 ));
                         } else {
-                            $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' .
+                            $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.
                                 Display::return_icon('edit.png',
-                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                         }
                         if ($course['status'] == COURSEMANAGER) {
                             //echo Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'), array('style'=>'width: 11px; height: 11px;'));
@@ -3423,7 +3423,7 @@ 
                     } else {
                         if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                             if ($load_dirs) {
-                                $params['right_actions'] .= '<a id="document_preview_' . $course['id'] . '_0" class="document_preview" href="javascript:void(0);">' .
+                                $params['right_actions'] .= '<a id="document_preview_'.$course['id'].'_0" class="document_preview" href="javascript:void(0);">'.
                                     Display::return_icon(
                                         'folder.png',
                                         get_lang('Documents'),
@@ -3431,7 +3431,7 @@ 
                                         ICON_SIZE_SMALL
                                     ).'</a>';
                                 $params['right_actions'] .= Display::div('', array(
-                                        'id' => 'document_result_' . $course['id'] . '_0',
+                                        'id' => 'document_result_'.$course['id'].'_0',
                                         'class' => 'document_preview_container'
                                     ));
                             }
@@ -3439,14 +3439,14 @@ 
                     }
 
                     if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED || $course['status'] == COURSEMANAGER) {
-                        $course_title = '<a href="' . $course_info['course_public_url'] . '?id_session=0&autoreg=1">' . $course_info['title'] . '</a>';
+                        $course_title = '<a href="'.$course_info['course_public_url'].'?id_session=0&autoreg=1">'.$course_info['title'].'</a>';
                     } else {
-                        $course_title = $course_info['title'] . " " . Display::tag('span', get_lang('CourseClosed'),
+                        $course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'),
                                 array('class' => 'item_closed'));
                     }
 
                     if (api_get_setting('display_coursecode_in_courselist') == 'true') {
-                        $course_title .= ' (' . $course_info['visual_code'] . ') ';
+                        $course_title .= ' ('.$course_info['visual_code'].') ';
                     }
                     if (api_get_setting('display_teacher_in_courselist') == 'true') {
                         $params['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string(
@@ -3495,7 +3495,7 @@ 
         // Step 1: We get all the categories of the user
         $table = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
         $sql = "SELECT id, title FROM $table
-                WHERE user_id = '" . $user_id . "'
+                WHERE user_id = '".$user_id."'
                 ORDER BY sort ASC";
         $result = Database::query($sql);
         $html = null;
@@ -3556,7 +3556,7 @@ 
 
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $special_course_list) . '")';
+            $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $special_course_list).'")';
         }
 
         //AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
@@ -3575,14 +3575,14 @@ 
                 WHERE
                     course.id = course_rel_user.c_id AND
                     url.c_id = course.id AND
-                    course_rel_user.user_id = '" . $user_id . "' AND
-                    course_rel_user.user_course_cat = '" . $user_category_id . "'
+                    course_rel_user.user_id = '".$user_id."' AND
+                    course_rel_user.user_course_cat = '" . $user_category_id."'
                     $without_special_courses ";
 
         // If multiple URL access mode is enabled, only fetch courses
         // corresponding to the current URL.
         if (api_get_multiple_access_url() && $current_url_id != -1) {
-            $sql .= " AND url.c_id = course.id AND access_url_id='" . $current_url_id . "'";
+            $sql .= " AND url.c_id = course.id AND access_url_id='".$current_url_id."'";
         }
         // Use user's classification for courses (if any).
         $sql .= " ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
@@ -3638,17 +3638,17 @@ 
 
             if (api_is_platform_admin()) {
                 if ($load_dirs) {
-                    $params['right_actions'] .= '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview" href="javascript:void(0);">' . Display::return_icon('folder.png',
-                            get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
-                    $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' . Display::return_icon('edit.png',
-                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                    $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png',
+                            get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
+                    $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png',
+                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                     $params['right_actions'] .= Display::div('', array(
-                            'id' => 'document_result_' . $course_info['real_id'] . '_0',
+                            'id' => 'document_result_'.$course_info['real_id'].'_0',
                             'class' => 'document_preview_container'
                         ));
                 } else {
-                    $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' . Display::return_icon('edit.png',
-                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                    $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png',
+                            get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                 }
 
                 if ($course_info['status'] == COURSEMANAGER) {
@@ -3657,16 +3657,16 @@ 
             } else {
                 if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                     if ($load_dirs) {
-                        $params['right_actions'] .= '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview" href="javascript:void(0);">' . Display::return_icon('folder.png',
-                                get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                        $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png',
+                                get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                         $params['right_actions'] .= Display::div('', array(
-                                'id' => 'document_result_' . $course_info['real_id'] . '_0',
+                                'id' => 'document_result_'.$course_info['real_id'].'_0',
                                 'class' => 'document_preview_container'
                             ));
                     } else {
                         if ($course_info['status'] == COURSEMANAGER) {
-                            $params['right_actions'] .= '<a href="' . api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'] . '">' . Display::return_icon('edit.png',
-                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL) . '</a>';
+                            $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png',
+                                    get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                         }
                     }
                 }
@@ -3674,16 +3674,16 @@ 
 
             $course_title_url = '';
             if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED || $course['status'] == COURSEMANAGER) {
-                $course_title_url = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php?id_session=0';
+                $course_title_url = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php?id_session=0';
                 $course_title = Display::url($course_info['title'], $course_title_url);
             } else {
-                $course_title = $course_info['title'] . " " . Display::tag('span', get_lang('CourseClosed'),
+                $course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'),
                         array('class' => 'item_closed'));
             }
 
             // Start displaying the course block itself
             if (api_get_setting('display_coursecode_in_courselist') == 'true') {
-                $course_title .= ' (' . $course_info['visual_code'] . ') ';
+                $course_title .= ' ('.$course_info['visual_code'].') ';
             }
 
             if (api_get_setting('display_teacher_in_courselist') == 'true') {
@@ -3896,14 +3896,14 @@ 
                 }
 
                 if ($user_in_course_status == COURSEMANAGER || $sessionCourseAvailable) {
-                    $session_url = $course_info['course_public_url'] . '?id_session=' . $course_info['id_session'];
-                    $session_title = '<h4><a href="' . $session_url. '">'. $course_info['name'] . '</a>'.$notifications.'</h4>';
+                    $session_url = $course_info['course_public_url'].'?id_session='.$course_info['id_session'];
+                    $session_title = '<h4><a href="'.$session_url.'">'.$course_info['name'].'</a>'.$notifications.'</h4>';
                 } else {
                     $session_title = $course_info['name'];
                 }
 
             } else {
-                $session_title = $course_info['name'] . ' ' . Display::tag('span', get_lang('CourseClosed'),
+                $session_title = $course_info['name'].' '.Display::tag('span', get_lang('CourseClosed'),
                         array('class' => 'item_closed'));
             }
         } else {
@@ -3928,21 +3928,21 @@ 
             $course_visibility != COURSE_VISIBILITY_HIDDEN
         ) {
             if ($load_dirs) {
-                $params['right_actions'] .= '<a id="document_preview_' . $course_info['real_id'] . '_' . $course_info['id_session'] . '" class="document_preview" href="javascript:void(0);">' .
+                $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_'.$course_info['id_session'].'" class="document_preview" href="javascript:void(0);">'.
                     Display::return_icon('folder.png',
                         get_lang('Documents'),
                         array('align' => 'absmiddle'),
                         ICON_SIZE_SMALL
-                    ) . '</a>';
+                    ).'</a>';
                 $params['right_actions'] .= Display::div('', array(
-                    'id' => 'document_result_' . $course_info['real_id'] . '_' . $course_info['id_session'],
+                    'id' => 'document_result_'.$course_info['real_id'].'_'.$course_info['id_session'],
                     'class' => 'document_preview_container'
                 ));
             }
         }
 
         if (api_get_setting('display_coursecode_in_courselist') == 'true') {
-            $session_title .= ' (' . $course_info['visual_code'] . ') ';
+            $session_title .= ' ('.$course_info['visual_code'].') ';
         }
 
         if (api_get_setting('display_teacher_in_courselist') == 'true') {
@@ -3971,7 +3971,7 @@ 
             }
         }
 
-        $session_title .= isset($course['special_course']) ? ' ' .
+        $session_title .= isset($course['special_course']) ? ' '.
                           Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
 
         $params['title'] = $session_title;
@@ -3987,12 +3987,12 @@ 
 
                 // Request for the name of the general coach
                 $sql = 'SELECT lastname, firstname,sc.name
-                        FROM ' . $tbl_session . ' ts
-                        LEFT JOIN ' . $main_user_table . ' tu
+                        FROM ' . $tbl_session.' ts
+                        LEFT JOIN ' . $main_user_table.' tu
                         ON ts.id_coach = tu.user_id
-                        INNER JOIN ' . $tbl_session_category . ' sc
+                        INNER JOIN ' . $tbl_session_category.' sc
                         ON ts.session_category_id = sc.id
-                        WHERE ts.id=' . (int)$course_info['id_session'] . '
+                        WHERE ts.id=' . (int) $course_info['id_session'].'
                         LIMIT 1';
 
                 $rs = Database::query($sql);
@@ -4007,14 +4007,14 @@ 
                     //$session['dates'] = get_lang('WithoutTimeLimits');
                     $session['dates'] = '';
                     if (api_get_setting('show_session_coach') === 'true') {
-                        $session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name($sessioncoach['firstname'],
+                        $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'],
                                 $sessioncoach['lastname']);
                     }
                     $active = true;
                 } else {
-                    $session ['dates'] = ' - ' . get_lang('From') . ' ' . $course_info['access_start_date'] . ' ' . get_lang('To') . ' ' . $course_info['access_end_date'];
+                    $session ['dates'] = ' - '.get_lang('From').' '.$course_info['access_start_date'].' '.get_lang('To').' '.$course_info['access_end_date'];
                     if (api_get_setting('show_session_coach') === 'true') {
-                        $session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name($sessioncoach['firstname'],
+                        $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'],
                                 $sessioncoach['lastname']);
                     }
                     $active = ($date_start <= $now && $date_end >= $now);
@@ -4066,9 +4066,9 @@ 
         $destination_session_id,
         $params = array()
     ) {
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseBuilder.class.php';
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseRestorer.class.php';
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseSelectForm.class.php';
+        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseBuilder.class.php';
+        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseRestorer.class.php';
+        require_once api_get_path(SYS_CODE_PATH).'coursecopy/classes/CourseSelectForm.class.php';
 
         $course_info = api_get_course_info($source_course_code);
 
@@ -4141,7 +4141,7 @@ 
             if (Database::num_rows($result) > 0) {
                 $row = Database::fetch_array($result);
                 $count = $row['count'] + 1;
-                $wanted_code = $wanted_code . '_' . $count;
+                $wanted_code = $wanted_code.'_'.$count;
                 $result = api_get_course_info($wanted_code);
                 if (empty($result)) {
                     return $wanted_code;
@@ -4175,7 +4175,7 @@ 
         $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
 
         if ($enabled == 'true') {
-            require_once api_get_path(SYS_PLUGIN_PATH) . 'courselegal/config.php';
+            require_once api_get_path(SYS_PLUGIN_PATH).'courselegal/config.php';
             $plugin = CourseLegalPlugin::create();
             return $plugin->isUserAcceptedLegal($user_id, $course_code, $session_id);
         }
@@ -4220,7 +4220,7 @@ 
         $enabled = api_get_plugin_setting('courselegal', 'tool_enable');
 
         if ($enabled == 'true') {
-            require_once api_get_path(SYS_PLUGIN_PATH) . 'courselegal/config.php';
+            require_once api_get_path(SYS_PLUGIN_PATH).'courselegal/config.php';
             $plugin = CourseLegalPlugin::create();
             return $plugin->saveUserLegal($user_id, $course_code, $session_id);
         }
@@ -4561,10 +4561,10 @@ 
                 INNER JOIN $table_course_url u
                 ON u.c_id = c.id
                 WHERE
-                    u.access_url_id = " . api_get_current_access_url_id() . " AND
+                    u.access_url_id = ".api_get_current_access_url_id()." AND
                     login_course_date <= '$now' AND
                     login_course_date > DATE_SUB('$now', INTERVAL $days DAY) AND
-                    visibility <> '" . COURSE_VISIBILITY_CLOSED . "' AND visibility <> '" . COURSE_VISIBILITY_HIDDEN . "'
+                    visibility <> '".COURSE_VISIBILITY_CLOSED."' AND visibility <> '".COURSE_VISIBILITY_HIDDEN."'
                 GROUP BY a.c_id
                 ORDER BY course_count DESC
                 LIMIT $limit
@@ -4590,7 +4590,7 @@ 
     {
         $hotCourses = [];
 
-        $ajax_url = api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=add_course_vote';
+        $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote';
 
         $stok = Security::get_existing_token();
 
@@ -4612,7 +4612,7 @@ 
             if ($access_link && in_array('register', $access_link)) {
                 $my_course['extra_info']['register_button'] = Display::url(
                     Display::returnFontAwesomeIcon('sign-in'),
-                    api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php?action=subscribe&sec_token=' . $stok,
+                    api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php?action=subscribe&sec_token='.$stok,
                     array('class' => 'btn btn-success btn-sm', 'title' => get_lang('Subscribe')));
             }
 
@@ -4621,14 +4621,14 @@ 
             ) {
                 $my_course['extra_info']['go_to_course_button'] = Display::url(
                     Display::returnFontAwesomeIcon('share'),
-                    api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/index.php',
+                    api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php',
                     array('class' => 'btn btn-default btn-sm', 'title' => get_lang('GoToCourse')));
             }
 
             if ($access_link && in_array('unsubscribe', $access_link)) {
                 $my_course['extra_info']['unsubscribe_button'] = Display::url(
                     Display::returnFontAwesomeIcon('sign-out'),
-                    api_get_path(WEB_CODE_PATH) . 'auth/courses.php?action=unsubscribe&unsubscribe=' . $courseCode . '&sec_token=' . $stok . '&category_code=' . $categoryCode,
+                    api_get_path(WEB_CODE_PATH).'auth/courses.php?action=unsubscribe&unsubscribe='.$courseCode.'&sec_token='.$stok.'&category_code='.$categoryCode,
                     array('class' => 'btn btn-danger btn-sm', 'title' => get_lang('Unreg')));
             }
 
@@ -4639,7 +4639,7 @@ 
             ) { */
                 $my_course['extra_info']['description_button'] = Display::url(
                     Display::returnFontAwesomeIcon('info-circle'),
-                    api_get_path(WEB_AJAX_PATH) . 'course_home.ajax.php?a=show_course_information&code=' . $course_info['code'],
+                    api_get_path(WEB_AJAX_PATH).'course_home.ajax.php?a=show_course_information&code='.$course_info['code'],
                     [
                         'class' => 'btn btn-default btn-sm ajax',
                         'data-title' => get_lang('Description'),
@@ -4650,8 +4650,8 @@ 
             /* get_lang('Description') */
             $my_course['extra_info']['teachers'] = CourseManager::get_teacher_list_from_course_code_to_string($course_info['code']);
             $point_info = self::get_course_ranking($course_info['real_id'], 0);
-            $my_course['extra_info']['rating_html'] = Display::return_rating_system('star_' . $course_info['real_id'],
-                $ajax_url . '&course_id=' . $course_info['real_id'], $point_info);
+            $my_course['extra_info']['rating_html'] = Display::return_rating_system('star_'.$course_info['real_id'],
+                $ajax_url.'&course_id='.$course_info['real_id'], $point_info);
 
             $hotCourses[] = $my_course;
         }
@@ -4725,9 +4725,9 @@ 
                     WHERE
                         c.id = u.c_id AND
                         u.access_url_id = $urlId AND
-                        visibility <> " . COURSE_VISIBILITY_HIDDEN;
+                        visibility <> ".COURSE_VISIBILITY_HIDDEN;
         } else {
-            $sql .= " WHERE visibility <> " . COURSE_VISIBILITY_HIDDEN;
+            $sql .= " WHERE visibility <> ".COURSE_VISIBILITY_HIDDEN;
         }
         $res = Database::query($sql);
         $row = Database::fetch_row($res);
@@ -4747,7 +4747,7 @@ 
 
         $withoutSpecialCourses = '';
         if (!empty($specialCourseList)) {
-            $withoutSpecialCourses = ' AND c.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+            $withoutSpecialCourses = ' AND c.code NOT IN ("'.implode('","', $specialCourseList).'")';
         }
 
         $visibilityCondition = null;
@@ -4881,12 +4881,12 @@ 
             if (count($teachers) > 0) {
                 foreach ($teachers as $key) {
                     $key = Database::escape_string($key);
-                    $cond .= " AND user_id <> '" . $key . "'";
+                    $cond .= " AND user_id <> '".$key."'";
                 }
             }
 
-            $sql = 'DELETE FROM ' . $course_user_table . '
-                    WHERE c_id ="' . $courseId . '" AND status="1" AND relation_type = 0 ' . $cond;
+            $sql = 'DELETE FROM '.$course_user_table.'
+                    WHERE c_id ="' . $courseId.'" AND status="1" AND relation_type = 0 '.$cond;
             Database::query($sql);
         }
 
@@ -4894,12 +4894,12 @@ 
             foreach ($teachers as $userId) {
                 $userId = intval($userId);
                 // We check if the teacher is already subscribed in this course
-                $sql = 'SELECT 1 FROM ' . $course_user_table . '
-                        WHERE user_id = "' . $userId . '" AND c_id = "' . $courseId . '" ';
+                $sql = 'SELECT 1 FROM '.$course_user_table.'
+                        WHERE user_id = "' . $userId.'" AND c_id = "'.$courseId.'" ';
                 $result = Database::query($sql);
                 if (Database::num_rows($result)) {
-                    $sql = 'UPDATE ' . $course_user_table . ' SET status = "1"
-                            WHERE c_id = "' . $courseId . '" AND user_id = "' . $userId . '"  ';
+                    $sql = 'UPDATE '.$course_user_table.' SET status = "1"
+                            WHERE c_id = "' . $courseId.'" AND user_id = "'.$userId.'"  ';
                 } else {
                     $userCourseCategory = '0';
                     if (isset($teacherBackup[$userId]) &&
@@ -4909,9 +4909,9 @@ 
                         $userCourseCategory = $courseUserData['user_course_cat'];
                     }
 
-                    $sql = "INSERT INTO " . $course_user_table . " SET
-                            c_id = " . $courseId . ",
-                            user_id = " . $userId . ",
+                    $sql = "INSERT INTO ".$course_user_table." SET
+                            c_id = " . $courseId.",
+                            user_id = " . $userId.",
                             status = '1',
                             is_tutor = '0',
                             sort = '0',
@@ -5247,8 +5247,8 @@ 
     {
         $tbl_main_categories = Database:: get_main_table(TABLE_MAIN_COURSE);
         $sql = 'SELECT title
-                FROM ' . $tbl_main_categories . '
-                WHERE code = "' . Database::escape_string($code) . '"';
+                FROM ' . $tbl_main_categories.'
+                WHERE code = "' . Database::escape_string($code).'"';
         $result = Database::query($sql);
         if ($col = Database::fetch_array($result)) {
             return $col['title'];
@@ -5431,7 +5431,7 @@ 
             foreach ($group_list as $this_group) {
                 if (is_array($to_already_selected)) {
                     if (!in_array(
-                        "GROUP:" . $this_group['id'],
+                        "GROUP:".$this_group['id'],
                         $to_already_selected
                     )
                     ) { // $to_already_selected is the array containing the groups (and users) that are already selected
@@ -5439,8 +5439,8 @@ 
                         $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled";
                         $result[] = array(
                             'disabled' => $user_disabled,
-                            'value' => "GROUP:" . $this_group['id'],
-                            'content' => "G: " . $this_group['name'] . " - " . $this_group['userNb'] . " " . $user_label
+                            'value' => "GROUP:".$this_group['id'],
+                            'content' => "G: ".$this_group['name']." - ".$this_group['userNb']." ".$user_label
                         );
                     }
                 }
@@ -5452,13 +5452,13 @@ 
             foreach ($user_list as $user) {
                 if (is_array($to_already_selected)) {
                     if (!in_array(
-                        "USER:" . $user['user_id'],
+                        "USER:".$user['user_id'],
                         $to_already_selected
                     )
                     ) { // $to_already_selected is the array containing the users (and groups) that are already selected
 
                         $result[] = array(
-                            'value' => "USER:" . $user['user_id'],
+                            'value' => "USER:".$user['user_id'],
                             'content' => api_get_person_name($user['firstname'], $user['lastname'])
                         );
                     }
@@ -5487,7 +5487,7 @@ 
     {
         $category_id = intval($category_id);
         $info = Database::fetch_array(
-            Database::query('SELECT course_code FROM ' . Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY) . '
+            Database::query('SELECT course_code FROM '.Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY).'
             WHERE id=' . $category_id), 'ASSOC'
         );
         return $info ? $info['course_code'] : false;
@@ -5503,15 +5503,14 @@ 
     public static function getCoursesWithoutSession($startDate = null, $endDate = null, $includeClosed = false)
     {
         $dateConditional = ($startDate && $endDate) ?
-            " WHERE session_id IN (SELECT id FROM " . Database::get_main_table(TABLE_MAIN_SESSION) .
-            " WHERE access_start_date = '$startDate' AND access_end_date = '$endDate')" :
-            null;
+            " WHERE session_id IN (SELECT id FROM ".Database::get_main_table(TABLE_MAIN_SESSION).
+            " WHERE access_start_date = '$startDate' AND access_end_date = '$endDate')" : null;
         $visibility = ($includeClosed ? '' : 'visibility NOT IN (0, 4) AND ');
 
         $query = "SELECT id, code, title
-                FROM " . Database::get_main_table(TABLE_MAIN_COURSE). "
+                FROM " . Database::get_main_table(TABLE_MAIN_COURSE)."
                 WHERE $visibility code NOT IN (
-                    SELECT DISTINCT course_code FROM " . Database::get_main_table(TABLE_MAIN_SESSION_COURSE) . $dateConditional . ")
+                    SELECT DISTINCT course_code FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE).$dateConditional.")
                 ORDER BY id";
 
         $result = Database::query($query);
@@ -5544,7 +5543,7 @@ 
                 FROM $courseTable c
                 INNER JOIN $courseUserTable cru ON c.id = cru.c_id
                 WHERE (
-                    cru.user_id IN (" . implode(', ', $userIdList) . ")
+                    cru.user_id IN (".implode(', ', $userIdList).")
                     AND cru.relation_type = 0
                 )";
 
@@ -5559,7 +5558,7 @@ 
                         INNER JOIN $courseAccessUrlTable crau ON c.id = crau.c_id
                         WHERE crau.access_url_id = $accessUrlId
                             AND (
-                            cru.id_user IN (" . implode(', ', $userIdList) . ") AND
+                            cru.id_user IN (".implode(', ', $userIdList).") AND
                             cru.relation_type = 0
                         )";
             }
@@ -5668,7 +5667,7 @@ 
 
         $without_special_courses = '';
         if (!empty($special_course_list)) {
-            $without_special_courses = ' AND course.code NOT IN ("'.implode('","',$special_course_list).'")';
+            $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $special_course_list).'")';
         }
 
         //AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
@@ -5724,11 +5723,11 @@ 
 
         if (api_is_platform_admin()) {
             if ($loadDirs) {
-                $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
-                $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                 $params['right_actions'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class'=>'document_preview_container'));
             } else {
-                $params['right_actions'].= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
             }
 
             if ($course_info['status'] == COURSEMANAGER) {
@@ -5737,11 +5736,11 @@ 
         } else {
             if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED) {
                 if ($loadDirs) {
-                    $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                    $params['right_actions'] .= '<a id="document_preview_'.$course_info['real_id'].'_0" class="document_preview" href="javascript:void(0);">'.Display::return_icon('folder.png', get_lang('Documents'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                     $params['right_actions'] .= Display::div('', array('id' => 'document_result_'.$course_info['real_id'].'_0', 'class'=>'document_preview_container'));
                 } else {
                     if ($course_info['status'] == COURSEMANAGER) {
-                        $params['right_actions'].= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'),ICON_SIZE_SMALL).'</a>';
+                        $params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'course_info/infocours.php?cidReq='.$course['code'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
                     }
                 }
             }
@@ -5752,7 +5751,7 @@ 
             $course_title_url = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/?id_session=0';
             $course_title = Display::url($course_info['title'], $course_title_url);
         } else {
-            $course_title = $course_info['title']." ".Display::tag('span',get_lang('CourseClosed'), array('class'=>'item_closed'));
+            $course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'), array('class'=>'item_closed'));
         }
 
         // Start displaying the course block itself

Braces +2 added lines, -2 removed lines

@@ -1880,7 +1880,7 @@ 
                         $html .= Display::tag('li', Display::return_icon('teacher.png', $teacher, null, ICON_SIZE_TINY) . ' ' . $teacher);
                     }
                     $html .= '</ul>';
-                }else{
+                } else{
                     $html .= array_to_string($list, $separator);
                 }
             }
@@ -3236,7 +3236,7 @@ 
             $html .= '<a class="thumbnail" href="'.$params['link'].'">';
             $html .= $params['icon'];
             $html .= '</a>';
-        }else{
+        } else{
             $html .= $params['icon'];
         }
         $html .= '</div>';

main/inc/lib/course_category.lib.php

Doc Comments +4 added lines, -5 removed lines

@@ -111,7 +111,7 @@ 
  * @param string $canHaveCourses
  * @param int $parent_id
  *
- * @return bool
+ * @return false|string
  */
 function addNode($code, $name, $canHaveCourses, $parent_id)
 {
@@ -306,8 +306,7 @@ 
 /**
  * Counts the number of children categories a category has
  * @param int   $categoryId The ID of the category of which we want to count the children
- * @param int   $count  The number of subcategories we counted this far
- * @return mixed The number of subcategories this category has
+ * @return integer The number of subcategories this category has
  */
 function courseCategoryChildrenCount($categoryId)
 {
@@ -474,7 +473,7 @@ 
 /**
  * @param int $id
  *
- * @return bool
+ * @return false|null
  */
 function addToUrl($id)
 {
@@ -970,7 +969,7 @@ 
  * Get Pagination HTML div
  * @param $pageCurrent
  * @param $pageLength
- * @param $pageTotal
+ * @param integer $pageTotal
  * @return string
  */
 function getCataloguePagination($pageCurrent, $pageLength, $pageTotal)

Spacing +32 added lines, -34 removed lines

@@ -68,7 +68,7 @@ 
 
     $parentIdCondition = " AND (t1.parent_id IS NULL OR t1.parent_id = '' )";
     if (!empty($category)) {
-        $parentIdCondition =  " AND t1.parent_id  = '$category' ";
+        $parentIdCondition = " AND t1.parent_id  = '$category' ";
     }
 
     $sql = "SELECT
@@ -99,7 +99,7 @@ 
 
     $categories = Database::store_result($result);
     foreach ($categories as $category) {
-        $category['nbr_courses'] =  1;
+        $category['nbr_courses'] = 1;
     }
 
     return $categories;
@@ -196,13 +196,13 @@ 
     if ($row = Database::fetch_array($result)) {
         if (!empty($row['parent_id'])) {
             Database::query("UPDATE $tbl_course SET category_code = '".$row['parent_id']."' WHERE category_code='$node'");
-            Database::query("UPDATE $tbl_category SET parent_id='" . $row['parent_id'] . "' WHERE parent_id='$node'");
+            Database::query("UPDATE $tbl_category SET parent_id='".$row['parent_id']."' WHERE parent_id='$node'");
         } else {
             Database::query("UPDATE $tbl_course SET category_code='' WHERE category_code='$node'");
             Database::query("UPDATE $tbl_category SET parent_id=NULL WHERE parent_id='$node'");
         }
 
-        Database::query("UPDATE $tbl_category SET tree_pos=tree_pos-1 WHERE tree_pos > '" . $row['tree_pos'] . "'");
+        Database::query("UPDATE $tbl_category SET tree_pos=tree_pos-1 WHERE tree_pos > '".$row['tree_pos']."'");
         Database::query("DELETE FROM $tbl_category WHERE code='$node'");
 
         if (!empty($row['parent_id'])) {
@@ -291,13 +291,13 @@ 
     }
 
     $sql = "UPDATE $tbl_category
-            SET tree_pos ='" . $row['tree_pos'] . "'
+            SET tree_pos ='".$row['tree_pos']."'
             WHERE code='$code'";
     Database::query($sql);
 
     $sql = "UPDATE $tbl_category
             SET tree_pos = '$tree_pos'
-            WHERE code= '" . $row['code'] . "'";
+            WHERE code= '".$row['code']."'";
     Database::query($sql);
 
     return true;
@@ -424,12 +424,12 @@ 
 
         $editIcon = Display::return_icon('edit.png', get_lang('EditNode'), null, ICON_SIZE_SMALL);
         $deleteIcon = Display::return_icon('delete.png', get_lang('DeleteNode'), null, ICON_SIZE_SMALL);
-        $moveIcon =  Display::return_icon('up.png', get_lang('UpInSameLevel'), null, ICON_SIZE_SMALL);
+        $moveIcon = Display::return_icon('up.png', get_lang('UpInSameLevel'), null, ICON_SIZE_SMALL);
 
         foreach ($categories as $category) {
 
             $editUrl = $mainUrl.'&id='.$category['code'].'&action=edit';
-            $moveUrl  = $mainUrl.'&id='.$category['code'].'&action=moveUp&tree_pos='.$category['tree_pos'];
+            $moveUrl = $mainUrl.'&id='.$category['code'].'&action=moveUp&tree_pos='.$category['tree_pos'];
             $deleteUrl = $mainUrl.'&id='.$category['code'].'&action=delete';
 
             $actions = Display::url($editIcon, $editUrl).Display::url($moveIcon, $moveUrl).Display::url($deleteIcon, $deleteUrl);
@@ -563,12 +563,12 @@ 
 
     $count_courses = countCoursesInCategory();
 
-    $categories[0][count($categories[0])+1] = array(
+    $categories[0][count($categories[0]) + 1] = array(
         'id' =>0,
         'name' => get_lang('None'),
         'code' => 'NONE',
         'parent_id' => null,
-        'tree_pos' => $row['tree_pos']+1,
+        'tree_pos' => $row['tree_pos'] + 1,
         'children_count' => 0,
         'auth_course_child' => true,
         'auth_cat_child' => true,
@@ -583,7 +583,7 @@ 
  * @param string $searchTerm
  * @return int
  */
-function countCoursesInCategory($category_code="", $searchTerm = '')
+function countCoursesInCategory($category_code = "", $searchTerm = '')
 {
     $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
     $categoryCode = Database::escape_string($category_code);
@@ -595,7 +595,7 @@ 
 
     $without_special_courses = '';
     if (!empty($specialCourseList)) {
-        $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+        $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $specialCourseList).'")';
     }
 
     $visibilityCondition = null;
@@ -609,15 +609,15 @@ 
     if ($categoryCode == 'ALL') {
         // Nothing to do
     } elseif ($categoryCode == 'NONE') {
-        $categoryFilter =  ' AND category_code = "" ';
+        $categoryFilter = ' AND category_code = "" ';
     } else {
-        $categoryFilter =  ' AND category_code = "' . $categoryCode . '" ';
+        $categoryFilter = ' AND category_code = "'.$categoryCode.'" ';
     }
 
     if (!empty($searchTerm)) {
-        $searchFilter = ' AND (code LIKE "%' . $searchTerm . '%"
-            OR title LIKE "%' . $searchTerm . '%"
-            OR tutor_name LIKE "%' . $searchTerm . '%") ';
+        $searchFilter = ' AND (code LIKE "%'.$searchTerm.'%"
+            OR title LIKE "%' . $searchTerm.'%"
+            OR tutor_name LIKE "%' . $searchTerm.'%") ';
     }
 
     $sql = "SELECT * FROM $tbl_course
@@ -668,7 +668,7 @@ 
 
     $without_special_courses = '';
     if (!empty($specialCourseList)) {
-        $without_special_courses = ' AND course.code NOT IN ("' . implode('","', $specialCourseList) . '")';
+        $without_special_courses = ' AND course.code NOT IN ("'.implode('","', $specialCourseList).'")';
     }
     $visibilityCondition = null;
     $hidePrivate = api_get_setting('course_catalog_hide_private');
@@ -716,7 +716,7 @@ 
         $id_in = null;
         while (list($id) = Database::fetch_row($result)) {
             if ($id_in) {
-                $id_in.=",$id";
+                $id_in .= ",$id";
             } else {
                 $id_in = "$id";
             }
@@ -937,11 +937,9 @@ 
 function getLimitArray()
 {
     $pageCurrent = isset($_REQUEST['pageCurrent']) ?
-        intval($_GET['pageCurrent']) :
-        1;
+        intval($_GET['pageCurrent']) : 1;
     $pageLength = isset($_REQUEST['pageLength']) ?
-        intval($_GET['pageLength']) :
-        10;
+        intval($_GET['pageLength']) : 10;
     return array(
         'start' => ($pageCurrent - 1) * $pageLength,
         'current' => $pageCurrent,
@@ -960,7 +958,7 @@ 
     if (!empty($limit) && is_array($limit)) {
         $limitStart = isset($limit['start']) ? $limit['start'] : 0;
         $limitLength = isset($limit['length']) ? $limit['length'] : 10;
-        $limitFilter = 'LIMIT ' . $limitStart . ', ' . $limitLength;
+        $limitFilter = 'LIMIT '.$limitStart.', '.$limitLength;
     }
 
     return $limitFilter;
@@ -977,7 +975,7 @@ 
 {
     // Start empty html
     $pageDiv = '';
-    $html='';
+    $html = '';
     $pageBottom = max(1, $pageCurrent - 3);
     $pageTop = min($pageTotal, $pageCurrent + 3);
 
@@ -1052,21 +1050,21 @@ 
     $hiddenLinks = isset($hiddenLinks) ? Security::remove_XSS($hiddenLinksRequest) : $categoryCodeRequest;
 
         // Start URL with params
-    $pageUrl = api_get_self() .
-        '?action=' . $action .
-        '&category_code=' .$categoryCode.
-        '&hidden_links=' .$hiddenLinks.
-        '&pageCurrent=' . $pageCurrent .
-        '&pageLength=' . $pageLength
+    $pageUrl = api_get_self().
+        '?action='.$action.
+        '&category_code='.$categoryCode.
+        '&hidden_links='.$hiddenLinks.
+        '&pageCurrent='.$pageCurrent.
+        '&pageLength='.$pageLength
     ;
 
     switch ($action) {
         case 'subscribe' :
             // for search
             $pageUrl .=
-                '&search_term=' . $searchTerm .
-                '&search_course=1' .
-                '&sec_token=' . $_SESSION['sec_token'];
+                '&search_term='.$searchTerm.
+                '&search_course=1'.
+                '&sec_token='.$_SESSION['sec_token'];
             break;
         case 'display_courses' :
             // No break