Browse Source

Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Yannick Warnier 7 years ago
parent
commit
0cab6e44b0
2 changed files with 9 additions and 1 deletions
  1. 1 1
      main/inc/lib/login.lib.php
  2. 8 0
      main/inc/lib/online.inc.php

+ 1 - 1
main/inc/lib/login.lib.php

@@ -481,7 +481,7 @@ class Login
             }
         } else {
             // Continue with the previous values
-            if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values...
+            if (empty($_SESSION['_course']) or empty($_SESSION['_cid'])) { //no previous values...
                 $_cid = -1; //set default values that will be caracteristic of being unset
                 $_course = -1;
             } else {

+ 8 - 0
main/inc/lib/online.inc.php

@@ -163,6 +163,7 @@ function online_logout($user_id = null, $logout_redirect = false)
 /**
  * Remove all login records from the track_e_online stats table, for the given user ID.
  * @param int User ID
+ * @param integer $user_id
  * @return void
  */
 function LoginDelete($user_id)
@@ -322,6 +323,9 @@ function who_is_online($from, $number_of_items, $column = null, $direction = nul
     }
 }
 
+/**
+ * @param string $time_limit
+ */
 function who_is_online_count($time_limit = null, $friends = false)
 {
     if (empty($time_limit)) {
@@ -438,6 +442,10 @@ function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit
 	}
 }
 
+/**
+ * @param integer $uid
+ * @param string $time_limit
+ */
 function who_is_online_in_this_course_count($uid, $time_limit, $coursecode = null)
 {
 	if (empty($coursecode)) {