Minor - format code, add int casting

main/inc/lib/message.lib.php

@@ -92,6 +92,7 @@ class MessageManager
      * @param int    $number_of_items
      * @param string $column
      * @param string $direction
+     * @param int    $userId
      *
      * @return array
      */
@@ -106,12 +107,12 @@ class MessageManager
         $number_of_items = (int) $number_of_items;
         $userId = empty($userId) ? api_get_user_id() : (int) $userId;
 
-        //forcing this order
+        // Forcing this order.
         if (!isset($direction)) {
             $column = 2;
             $direction = 'DESC';
         } else {
-            $column = intval($column);
+            $column = (int) $column;
             if (!in_array($direction, ['ASC', 'DESC'])) {
                 $direction = 'ASC';
             }
@@ -144,7 +145,7 @@ class MessageManager
                 LIMIT $from, $number_of_items";
 
         $result = Database::query($sql);
-        $message_list = [];
+        $messageList = [];
         $newMessageLink = api_get_path(WEB_CODE_PATH).'messages/new_message.php';
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             $messageId = $row['col0'];
@@ -156,10 +157,9 @@ class MessageManager
             $title = Security::remove_XSS($title, STUDENT, true);
             $title = cut($title, 80, true);
 
+            $class = 'class = "read"';
             if ($status == 1) {
                 $class = 'class = "unread"';
-            } else {
-                $class = 'class = "read"';
             }
 
             $userInfo = api_get_user_info($senderId);
@@ -201,10 +201,10 @@ class MessageManager
             foreach ($message as $key => $value) {
                 $message[$key] = api_xml_http_response_encode($value);
             }
-            $message_list[] = $message;
+            $messageList[] = $message;
         }
 
-        return $message_list;
+        return $messageList;
     }
 
     /**
@@ -1120,6 +1120,7 @@ class MessageManager
      * @param int
      * @param int
      * @param string
+     * @param string
      *
      * @return array
      */
@@ -1129,13 +1130,13 @@ class MessageManager
         $column,
         $direction
     ) {
-        $from = intval($from);
+        $from = (int) $from;
-        $number_of_items = intval($number_of_items);
+        $number_of_items = (int) $number_of_items;
         if (!isset($direction)) {
             $column = 2;
             $direction = 'DESC';
         } else {
-            $column = intval($column);
+            $column = (int) $column;
             if (!in_array($direction, ['ASC', 'DESC'])) {
                 $direction = 'ASC';
             }
@@ -1168,13 +1169,12 @@ class MessageManager
                 ORDER BY col$column $direction
                 LIMIT $from, $number_of_items";
         $result = Database::query($sql);
-        $i = 0;
+
         $message_list = [];
         while ($row = Database::fetch_array($result, 'ASSOC')) {
             $messageId = $row['col0'];
             $title = $row['col1'];
             $sendDate = $row['col2'];
-            $status = $row['msg_status'];
             $senderId = $row['user_sender_id'];
 
             if ($request === true) {
@@ -1212,7 +1212,6 @@ class MessageManager
             }
 
             $message_list[] = $message;
-            $i++;
         }
 
         return $message_list;
@@ -1331,7 +1330,7 @@ class MessageManager
         }
 
         $message_content .= '<tr>';
-        if (api_get_setting('allow_social_tool') == 'true') {
+        if (api_get_setting('allow_social_tool') === 'true') {
             $message_content .= '<div class="row">';
             if ($source == 'outbox') {
                 $message_content .= '<div class="col-md-12">';
@@ -1419,16 +1418,17 @@ class MessageManager
      */
     public static function get_user_id_by_email($user_email)
     {
-        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+        $table = Database::get_main_table(TABLE_MAIN_USER);
-        $sql = 'SELECT user_id FROM '.$tbl_user.'
+        $sql = 'SELECT user_id 
+                FROM '.$table.'
                 WHERE email="'.Database::escape_string($user_email).'";';
         $rs = Database::query($sql);
         $row = Database::fetch_array($rs, 'ASSOC');
         if (isset($row['user_id'])) {
             return $row['user_id'];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -1566,12 +1566,10 @@ class MessageManager
      *
      * @param $groupId
      * @param $topic_id
-     * @param $is_member
-     * @param $messageId
      *
      * @return string
      */
-    public static function display_message_for_group($groupId, $topic_id, $is_member, $messageId)
+    public static function display_message_for_group($groupId, $topic_id)
     {
         global $my_group_role;
         $main_message = self::get_message_by_id($topic_id);
@@ -2055,12 +2053,9 @@ class MessageManager
     }
 
     /**
-     * @param $id
-     * @param array $params
-     *
      * @return string
      */
-    public static function generate_invitation_form($id, $params = [])
+    public static function generate_invitation_form()
     {
         $form = new FormValidator('send_invitation');
         $form->addTextarea(
@@ -2072,8 +2067,6 @@ class MessageManager
         return $form->returnForm();
     }
 
-    //@todo this functions should be in the message class
-
     /**
      * @param string $keyword
      *
@@ -2242,8 +2235,8 @@ class MessageManager
      */
     public static function getMessagesFromLastReceivedMessage($userId, $lastId = 0)
     {
-        $userId = intval($userId);
+        $userId = (int) $userId;
-        $lastId = intval($lastId);
+        $lastId = (int) $lastId;
 
         if (empty($userId)) {
             return [];
@@ -2462,7 +2455,6 @@ class MessageManager
 
             // Get the reason of mail fail
             $iX = 1;
-
             while (!feof($mailFile)) {
                 $mailLine = fgets($mailFile);
                 //if ($iX == 4 && preg_match('/(.*):\s(.*)$/', $mailLine, $matches)) {
@@ -2471,7 +2463,6 @@ class MessageManager
                 ) {
                     $mail_queue[$i]['reason'] = $detailsMatches[3];
                 }
-
                 $iX++;
             }
 
@@ -2569,6 +2560,7 @@ class MessageManager
         if (empty($courseInfo)) {
             return false;
         }
+
         $senderId = api_get_user_id();
         if (empty($senderId)) {
             return false;

main/inc/lib/notebook.lib.php

@@ -116,6 +116,7 @@ class NotebookManager
         // Database table definition
         $table = Database::get_course_table(TABLE_NOTEBOOK);
         $course_id = api_get_course_int_id();
+        $notebook_id = (int) $notebook_id;
 
         $sql = "SELECT
                 notebook_id 		AS notebook_id,
@@ -123,7 +124,7 @@ class NotebookManager
                 description 		AS note_comment,
                 session_id			AS session_id
                 FROM $table
-                WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' ";
+                WHERE c_id = $course_id AND notebook_id = '".$notebook_id."' ";
         $result = Database::query($sql);
         if (Database::num_rows($result) != 1) {
             return [];
@@ -146,9 +147,10 @@ class NotebookManager
      */
     public static function update_note($values)
     {
-        if (!is_array($values) or empty($values['note_title'])) {
+        if (!is_array($values) || empty($values['note_title'])) {
             return false;
         }
+
         // Database table definition
         $table = Database::get_course_table(TABLE_NOTEBOOK);
 
@@ -194,7 +196,9 @@ class NotebookManager
      */
     public static function delete_note($notebook_id)
     {
-        if (empty($notebook_id) || $notebook_id != strval(intval($notebook_id))) {
+        $notebook_id = (int) $notebook_id;
+
+        if (empty($notebook_id)) {
             return false;
         }
 
@@ -205,10 +209,11 @@ class NotebookManager
         $sql = "DELETE FROM $table
                 WHERE
                     c_id = $course_id AND
-                    notebook_id='".intval($notebook_id)."' AND
+                    notebook_id='".$notebook_id."' AND
                     user_id = '".api_get_user_id()."'";
         $result = Database::query($sql);
         $affected_rows = Database::affected_rows($result);
+
         if ($affected_rows != 1) {
             return false;
         }
@@ -217,7 +222,7 @@ class NotebookManager
         api_item_property_update(
             api_get_course_info(),
             TOOL_NOTEBOOK,
-            intval($notebook_id),
+            $notebook_id,
             'delete',
             api_get_user_id()
         );
@@ -271,12 +276,12 @@ class NotebookManager
 
         // Database table definition
         $table = Database::get_course_table(TABLE_NOTEBOOK);
-        $order_by = " ORDER BY ".$notebookView." $sort_direction ";
+        $order_by = ' ORDER BY '.$notebookView." $sort_direction ";
 
         // Condition for the session
         $condition_session = api_get_session_condition($sessionId);
 
-        $cond_extra = $notebookView == 'update_date' ? " AND update_date <> ''" : " ";
+        $cond_extra = $notebookView == 'update_date' ? " AND update_date <> ''" : ' ';
         $course_id = api_get_course_int_id();
 
         $sql = "SELECT * FROM $table

main/inc/lib/online.inc.php

@@ -207,7 +207,7 @@ function user_is_online($user_id)
 
     $online_time = time() - $time_limit * 60;
     $limit_date = api_get_utc_datetime($online_time);
-    $user_id = intval($user_id);
+    $user_id = (int) $user_id;
 
     $query = " SELECT login_user_id, login_date
                FROM $track_online_table track

main/inc/lib/promotion.lib.php

@@ -226,7 +226,8 @@ class Promotion extends Model
         if ($action == 'edit') {
             $header = get_lang('Modify');
         }
-        $id = isset($_GET['id']) ? intval($_GET['id']) : '';
+
+        $id = isset($_GET['id']) ? (int) $_GET['id'] : '';
 
         $form->addElement('header', '', $header);
         $form->addElement('hidden', 'id', $id);