Format code

main/inc/lib/api.lib.php

@@ -1227,7 +1227,11 @@ function api_is_self_registration_allowed()
  */
 function api_get_user_id()
 {
-    return empty($GLOBALS['_user']['user_id']) ? 0 : intval($GLOBALS['_user']['user_id']);
+    $userInfo = Session::read('_user');
+    if ($userInfo && isset($userInfo['user_id'])) {
+        return $userInfo['user_id'];
+    }
+    return 0;
 }
 
 /**
@@ -1282,7 +1286,6 @@ function _api_format_user($user, $add_password = false)
 
     $firstname = null;
     $lastname = null;
-
     if (isset($user['firstname']) && isset($user['lastname'])) {
         $firstname = $user['firstname'];
         $lastname = $user['lastname'];
@@ -1387,15 +1390,17 @@ function api_get_user_info(
     $loadExtraData = false,
     $loadOnlyVisibleExtraData = false
 ) {
+
     if (empty($user_id)) {
-        $userFromSession = Session::read('_user');
+        $userFromSession = Session::read('_user');        
         if (isset($userFromSession)) {
             return _api_format_user($userFromSession);
         }
-        // @todo trigger an exception here
+
         return false;
     }
 
+
     $sql = "SELECT * FROM ".Database :: get_main_table(TABLE_MAIN_USER)."
             WHERE id='".intval($user_id)."'";
     $result = Database::query($sql);
@@ -1908,7 +1913,8 @@ function api_check_password($password) {
  * @param bool      database check switch - passed to api_is_anonymous()
  * @return bool     true if succesfully unregistered, false if not anonymous.
  */
-function api_clear_anonymous($db_check = false) {
+function api_clear_anonymous($db_check = false)
+{
     global $_user;
     if (api_is_anonymous($_user['user_id'], $db_check)) {
         unset($_user['user_id']);
@@ -1980,7 +1986,6 @@ function api_set_anonymous() {
     if (!empty($_user['user_id'])) {
         return false;
     }
-
     $user_id = api_get_anonymous_id();
     if ($user_id == 0) {
         return false;
@@ -3178,10 +3183,12 @@ function api_is_allowed($tool, $action, $task_id = 0)
  * the session (false) to see if the current user is the anonymous user
  * @return bool     true if this user is anonymous, false otherwise
  */
-function api_is_anonymous($user_id = null, $db_check = false) {
+function api_is_anonymous($user_id = null, $db_check = false)
+{
     if (!isset($user_id)) {
         $user_id = api_get_user_id();
     }
+
     if ($db_check) {
         $info = api_get_user_info($user_id);
         if ($info['status'] == ANONYMOUS) {
@@ -3190,6 +3197,7 @@ function api_is_anonymous($user_id = null, $db_check = false) {
     }
 
     $_user = api_get_user_info();
+
     if (isset($_user['status']) && $_user['status'] == ANONYMOUS) {
         //if ($_user['user_id'] == 0) {
         // In some cases, api_set_anonymous doesn't seem to be triggered in local.inc.php. Make sure it is.
@@ -3202,7 +3210,7 @@ function api_is_anonymous($user_id = null, $db_check = false) {
         return true;
     }
 
-    return ((isset($_user['is_anonymous']) && $_user['is_anonymous'] === true) || $_user === false);
+    return (isset($_user['is_anonymous']) && $_user['is_anonymous'] === true) || $_user === false;
 }
 
 /**
@@ -4217,7 +4225,6 @@ function api_get_language_id($language)
 function api_get_language_from_type($lang_type)
 {
     $return = false;
-
     switch ($lang_type) {
         case 'platform_lang':
             $temp_lang = api_get_setting('platformLanguage');
@@ -4226,6 +4233,7 @@ function api_get_language_from_type($lang_type)
             break;
         case 'user_profil_lang':
             $_user = api_get_user_info();
+
             if (isset($_user['language']) && !empty($_user['language']))
                 $return = $_user['language'];
             break;

main/inc/local.inc.php

@@ -762,6 +762,7 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
 if (isset($use_anonymous) && $use_anonymous) {
     //if anonymous mode is set, then try to set the current user as anonymous
     //if he doesn't have a login yet
+
     api_set_anonymous();
 } else {
     //if anonymous mode is not set, then check if this user is anonymous. If it

main/session/add_users_to_session.php

@@ -10,20 +10,17 @@ $cidReset = true;
 // including some necessary files
 require_once '../inc/global.inc.php';
 $xajax = new xajax();
-
 $xajax->registerFunction('search_users');
 
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 
 $id_session = intval($_GET['id_session']);
-
 $addProcess = isset($_GET['add']) ? Security::remove_XSS($_GET['add']) : null;
 
 SessionManager::protectSession($id_session);
 
 // setting breadcrumbs
-//$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
 $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
 
@@ -237,7 +234,6 @@ function search_users($needle, $type)
             $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
         }
     }
-
     return $xajax_response;
 }
 
@@ -687,7 +683,6 @@ if (!empty($errorMsg)) {
 
     <div class="col-md-4">
         <label><?php echo get_lang('UserListInSession') ?> :</label>
-
         <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="form-control">
         <?php
         foreach ($sessionUsersList as $enreg) {