diff --git a/index.php b/index.php index f52add2330..b723f82c4b 100644 --- a/index.php +++ b/index.php @@ -98,7 +98,7 @@ if ($_GET['logout']) api_sql_query($s_sql_update_logout_date); - //LoginDelete($_uid, $statsDbName); + //LoginDelete(".$_user['user_id'].", $statsDbName); LoginDelete($_GET["uid"], $statsDbName); api_session_destroy(); @@ -151,7 +151,7 @@ $dateFormatForInfosFromCourses = $dateFormatLong; //define("CONFVAL_limitPreviewTo",SCRIPTVAL_NewEntriesOfTheDay); //define("CONFVAL_limitPreviewTo",SCRIPTVAL_NoTimeLimit); define("CONFVAL_limitPreviewTo", SCRIPTVAL_NewEntriesOfTheDayOfLastLogin); -if (isset ($_uid)) +if (isset ($_user['user_id'])) { $nameTools = api_get_setting('siteName'); } @@ -203,16 +203,15 @@ if ($_POST["submitAuth"]) { // To ensure legacy compatibility, we set the following variables. // But they should be removed at last. - $uid = $_uid; - $lastname = $_user['lastName']; - $firstname = $_user['firstName']; - $email = $_user['mail']; - $status = $uData['status']; - if (isset ($_uid)) + $lastname = $_user['lastName']; + $firstname = $_user['firstName']; + $email = $_user['mail']; + $status = $uData['status']; + if (isset ($_user['user_id'])) { $sqlLastLogin = "SELECT UNIX_TIMESTAMP(login_date) FROM $track_login_table - WHERE login_user_id = '$_uid' + WHERE login_user_id = '".$_user['user_id']."' ORDER BY login_date DESC LIMIT 1"; $resLastLogin = api_sql_query($sqlLastLogin, __FILE__, __LINE__); if (!$resLastLogin) @@ -281,8 +280,7 @@ function display_anonymous_right_menu() $platformLanguage = api_get_setting('platformLanguage'); - $_uid = api_get_user_id(); - if ( !(isset($_uid) && $_uid) ) // only display if the user isn't logged in + if ( !(isset(api_get_user_id()) && api_get_user_id()) ) // only display if the user isn't logged in { api_display_language_form(); echo '
'; @@ -325,7 +323,7 @@ function display_anonymous_right_menu() echo ''; echo ''; - if ($_uid) + if (api_get_user_id()) { api_plugin('campushomepage_menu'); } @@ -554,7 +552,7 @@ echo '
'; Plugins for loginpage_main AND campushomepage_main ----------------------------------------------------------------------------- */ -if (!$_uid) +if (!api_get_user_id()) { api_plugin('loginpage_main'); } diff --git a/myStudents.php b/myStudents.php index e107ffceb9..6a0b04194f 100644 --- a/myStudents.php +++ b/myStudents.php @@ -146,7 +146,7 @@ function exportCsv($a_infosUser,$tableTitle,$a_header,$a_dataLearnpath,$a_dataEx -> '; } diff --git a/newsList.php b/newsList.php index 6beb34cc09..3ffbf0b126 100644 --- a/newsList.php +++ b/newsList.php @@ -18,10 +18,10 @@ $start = 0; } - if (isset($_uid)) + if (isset($_user['user_id'])) { $visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUDENT; - SystemAnnouncementManager :: display_all_announcements($visibility, $announcement, $start, $_uid); + SystemAnnouncementManager :: display_all_announcements($visibility, $announcement, $start, $_user['user_id']); } else { diff --git a/plugin/messages/functions.inc.php b/plugin/messages/functions.inc.php index 6c1b1492a0..0c35a790aa 100755 --- a/plugin/messages/functions.inc.php +++ b/plugin/messages/functions.inc.php @@ -1,4 +1,4 @@ -'; foreach($userlist as $row) - echo "\n"; + echo "\n"; echo ""; } @@ -139,9 +139,9 @@ function get_new_messages() */ function users_connected_by_id() { - global $statsDbName, $_uid; + global $statsDbName, $_user; $MINUTE=30; - $user_connect = WhoIsOnline($_uid,$statsDbName,$MINUTE); + $user_connect = WhoIsOnline($_user['user_id'],$statsDbName,$MINUTE); for ($i=0; $i".get_lang("PlatformAdmin").""; } +/** + * Enter description here... + * + */ function display_create_course_link() { echo "
  • ".get_lang("CourseCreate")."
  • "; } +/** + * Enter description here... + * + */ function display_edit_course_list_links() { echo "
  • ".get_lang("CourseManagement")."
  • "; @@ -762,9 +779,10 @@ function show_notification($mycours) */ function get_user_course_categories() { - global $_uid; + global $_user; + $table_category = Database::get_user_personal_table(USER_COURSE_CATEGORY_TABLE); - $sql = "SELECT * FROM ".$table_category." WHERE user_id='".$_uid."'"; + $sql = "SELECT * FROM ".$table_category." WHERE user_id='".$_user['user_id']."'"; $result = api_sql_query($sql,__FILE__,__LINE__); while ($row = mysql_fetch_array($result)) { @@ -845,11 +863,11 @@ else if(api_get_setting('use_session_mode')=='true' && !$nosession) { - $personal_course_list = get_personal_session_course_list($_uid); + $personal_course_list = get_personal_session_course_list($_user['user_id']); } else { - $personal_course_list = get_personal_course_list($_uid); + $personal_course_list = get_personal_course_list($_user['user_id']); } foreach ($personal_course_list as $mycours) { diff --git a/webchatdeny.php b/webchatdeny.php index 32c2d34480..822c8fc95d 100644 --- a/webchatdeny.php +++ b/webchatdeny.php @@ -32,7 +32,7 @@ include_once('./main/inc/global.inc.php'); $track_user_table = Database::get_main_table(MAIN_USER_TABLE); -$sql="update $track_user_table set chatcall_user_id = '', chatcall_date = '', chatcall_text='DENIED' where (user_id = $_uid)"; +$sql="update $track_user_table set chatcall_user_id = '', chatcall_date = '', chatcall_text='DENIED' where (user_id = ".$_user['user_id'].")"; $result=api_sql_query($sql,__FILE__,__LINE__); Display::display_header(); diff --git a/whoisonline.php b/whoisonline.php index f4d1527834..36827698b1 100644 --- a/whoisonline.php +++ b/whoisonline.php @@ -1,4 +1,4 @@ - 0) { - $user_list = Who_is_online_in_this_course($_uid,api_get_setting('time_limit_whosonline'),$_GET['cidReq']); + $user_list = Who_is_online_in_this_course($_user['user_id'],api_get_setting('time_limit_whosonline'),$_GET['cidReq']); } else { - $user_list = WhoIsOnline($_uid,$statsDbName,api_get_setting('time_limit_whosonline')); + $user_list = WhoIsOnline($_user['user_id'],$statsDbName,api_get_setting('time_limit_whosonline')); } $total=count($user_list); @@ -234,7 +234,7 @@ if ((get_setting('showonline','world') == 'true' AND !$_uid) OR (get_setting('sh } else { - if(0) // if ($_uid && $_GET["id"] != $_uid) + if(0) // if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) { echo ''.get_lang('SendChatRequest').''; } diff --git a/whoisonlinesession.php b/whoisonlinesession.php index e16d6c056d..2afef03b2b 100644 --- a/whoisonlinesession.php +++ b/whoisonlinesession.php @@ -43,7 +43,7 @@ Display::display_header(get_lang('UserOnlineListSession')); date_end FROM session INNER JOIN session_rel_course - ON session_rel_course.id_coach = $_uid + ON session_rel_course.id_coach = ".$_user['user_id']." ORDER BY date_start, date_end, name",__FILE__,__LINE__); $sessionIsCoach = api_store_result($result); @@ -53,7 +53,7 @@ Display::display_header(get_lang('UserOnlineListSession')); date_start, date_end FROM session - WHERE session.id_coach = $_uid + WHERE session.id_coach = ".$_user['user_id']." ORDER BY date_start, date_end, name",__FILE__,__LINE__); $sessionIsCoach = array_merge($sessionIsCoach , api_store_result($result));