Feature #1744 - Cleaning logical conditions: if ($_configuration['multiple_access_urls'] == true) ------> if ($_configuration['multiple_access_urls'])

skala
Ivan Tcholakov 15 years ago
parent 9ff4b4a7e3
commit f0c4747bf3
  1. 2
      index.php
  2. 4
      main/admin/add_courses_to_session.php
  3. 8
      main/admin/add_users_to_group.php
  4. 10
      main/admin/add_users_to_session.php
  5. 6
      main/admin/calendar.lib.php
  6. 2
      main/admin/course_add.php
  7. 2
      main/admin/course_edit.php
  8. 8
      main/admin/course_list.php
  9. 2
      main/admin/group_add.php
  10. 12
      main/admin/group_list.php
  11. 6
      main/admin/session_add.php
  12. 2
      main/admin/session_course_user.php
  13. 2
      main/admin/session_edit.php
  14. 4
      main/admin/session_export.php
  15. 2
      main/admin/session_list.php
  16. 2
      main/admin/settings.php
  17. 24
      main/admin/statistics/statistics.lib.php
  18. 8
      main/admin/subscribe_user2course.php
  19. 2
      main/admin/user_add.php
  20. 2
      main/admin/user_edit.php
  21. 4
      main/admin/user_export.php
  22. 2
      main/admin/user_information.php
  23. 8
      main/admin/user_list.php
  24. 4
      main/calendar/agenda.inc.php
  25. 4
      main/calendar/myagenda.inc.php
  26. 2
      main/inc/lib/add_course.lib.inc.php
  27. 2
      main/inc/lib/add_courses_to_session_functions.lib.php
  28. 4
      main/inc/lib/course.lib.php
  29. 2
      main/inc/lib/group_portal_manager.lib.php
  30. 6
      main/inc/lib/online.inc.php
  31. 6
      main/inc/lib/sessionmanager.lib.php
  32. 26
      main/inc/lib/tracking.lib.php
  33. 20
      main/inc/lib/usermanager.lib.php
  34. 4
      main/inc/local.inc.php
  35. 2
      main/metadata/playscormmdset.inc.php
  36. 4
      main/mySpace/index.php
  37. 2
      main/mySpace/user_add.php
  38. 4
      main/social/group_invitation.php
  39. 12
      main/user/subscribe_user.php
  40. 2
      main/user/user_add.php
  41. 8
      main/webservices/registration.soap.php
  42. 4
      user_portal.php

@ -574,7 +574,7 @@ function display_anonymous_course_list() {
//showing only the courses of the current access_url_id
global $_configuration;
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id != -1) {
$tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);

@ -210,7 +210,7 @@ if ($ajax_search) {
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -241,7 +241,7 @@ if ($ajax_search) {
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -119,7 +119,7 @@ function search_users($needle,$type,$relation_type) {
$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user
WHERE (username LIKE '$needle%' OR firstname LIKE '$needle%' OR lastname LIKE '$needle%')
AND user_id<>'$user_anonymous' $without_user_id $order_clause LIMIT 11";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT user.user_id, username, lastname, firstname FROM $tbl_user user
@ -150,7 +150,7 @@ function search_users($needle,$type,$relation_type) {
if (!empty($group_id) && !empty($relation_type)) {
$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user
WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user_id<>'$user_anonymous' $without_user_id $order_clause ";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT user.user_id, username, lastname, firstname FROM $tbl_user user
@ -290,7 +290,7 @@ if ($ajax_search) {
$many_users = false;
$sql = "SELECT count(user_id) FROM $tbl_user user
WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user_id<>'$user_anonymous' $without_user_id ";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT count(user.user_id) FROM $tbl_user user
@ -325,7 +325,7 @@ if ($ajax_search) {
$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user
WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user_id<>'$user_anonymous' $without_user_id $order_clause ";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$sql = "SELECT user.user_id, username, lastname, firstname FROM $tbl_user user

@ -118,7 +118,7 @@ function search_users($needle,$type)
}
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -268,7 +268,7 @@ if ($ajax_search) {
AND $tbl_session_rel_user.id_session = ".intval($id_session)."
WHERE status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -318,7 +318,7 @@ if ($ajax_search) {
}
$where_filter ='';
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " AND u.user_id IN ('".implode("','",$final_result)."') ";
} else {
@ -351,7 +351,7 @@ if ($ajax_search) {
WHERE u.status<>".DRH."
$order_clause";
}
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -385,7 +385,7 @@ if ($ajax_search) {
ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -1634,7 +1634,7 @@ function get_agendaitems($month, $year)
//$mycourse = api_get_course_info();
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);
@ -1954,7 +1954,7 @@ function get_day_agendaitems($courses_dbs, $month, $year, $day)
//echo $sqlquery;
$result = Database::query($sqlquery);
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);
@ -2068,7 +2068,7 @@ function get_week_agendaitems($courses_dbs, $month, $year, $week = '')
$result = Database::query($sqlquery);
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);

@ -35,7 +35,7 @@ $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' O
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status=1".$order_clause;
//filtering teachers when creating a course
if ($_configuration['multiple_access_urls']==true){
if ($_configuration['multiple_access_urls']) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT u.user_id,lastname,firstname FROM $table_user as u
INNER JOIN $access_url_rel_user_table url_rel_user

@ -50,7 +50,7 @@ while ($obj = Database::fetch_object($res)) {
}
// Get all possible teachers without the course teachers
if ($_configuration['multiple_access_urls']==true){
if ($_configuration['multiple_access_urls']) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = "SELECT u.user_id,lastname,firstname FROM $table_user as u
INNER JOIN $access_url_rel_user_table url_rel_user

@ -27,7 +27,7 @@ function get_number_of_courses() {
$sql = "SELECT COUNT(code) AS total_number_of_items FROM $course_table";
global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql.= " INNER JOIN $access_url_rel_course_table url_rel_course ON (code=url_rel_course.course_code)";
}
@ -50,7 +50,7 @@ function get_number_of_courses() {
}
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_course.access_url_id=".api_get_current_access_url_id();
}
@ -69,7 +69,7 @@ function get_course_data($from, $number_of_items, $column, $direction)
$sql = "SELECT code AS col0, visual_code AS col1, title AS col2, course_language AS col3, category_code AS col4, subscribe AS col5, unsubscribe AS col6, tutor_name as col7, code AS col8, visibility AS col9,directory as col10 FROM $course_table";
//$sql = "SELECT code AS col0, visual_code AS col1, title AS col2, course_language AS col3, category_code AS col4, subscribe AS col5, unsubscribe AS col6, code AS col7, tutor_name as col8, code AS col9, visibility AS col10,directory as col11 FROM $course_table";
global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$sql.= " INNER JOIN $access_url_rel_course_table url_rel_course ON (code=url_rel_course.course_code)";
}
@ -92,7 +92,7 @@ function get_course_data($from, $number_of_items, $column, $direction)
}
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_course.access_url_id=".api_get_current_access_url_id();
}

@ -123,7 +123,7 @@ if( $form->validate()) {
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$url = api_get_access_url($access_url_id);

@ -34,7 +34,7 @@ function get_number_of_groups()
// adding the filter to see the user's only of the current access_url
/*
global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -46,7 +46,7 @@ function get_number_of_groups()
// adding the filter to see the user's only of the current access_url
/*
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}*/
@ -76,7 +76,7 @@ function get_group_data($from, $number_of_items, $column, $direction)
// adding the filter to see the user's only of the current access_url
/*global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}*/
@ -87,7 +87,7 @@ function get_group_data($from, $number_of_items, $column, $direction)
}
/*
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}*/
@ -134,7 +134,7 @@ function get_recent_group_data($from =0 , $number_of_items = 5, $column, $direct
// adding the filter to see the user's only of the current access_url
/*global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}*/
@ -145,7 +145,7 @@ function get_recent_group_data($from =0 , $number_of_items = 5, $column, $direct
}
/*
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}*/

@ -60,7 +60,7 @@ function search_coachs($needle) {
' LIMIT 10';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -119,7 +119,7 @@ if ($_POST['formSent']) {
global $_configuration;
require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
UrlManager::add_session_to_url($return,$access_url_id);
@ -178,7 +178,7 @@ if (intval($count_users)<50) {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
$sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1'".$order_clause;
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -153,7 +153,7 @@ $sql_all="SELECT code, title, visual_code, src.id_session " .
ORDER BY ".(sizeof($courses)?"(code IN(".implode(',',$courses).")) DESC,":"")." title";
*/
/*global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -66,7 +66,7 @@ if ($_POST['formSent']) {
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
$sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1'".$order_clause;
if ($_configuration['multiple_access_urls']==true){
if ($_configuration['multiple_access_urls']) {
$table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {

@ -73,7 +73,7 @@ if ($_POST['formSent'] )
ON $tbl_user.user_id = $tbl_session.id_coach ORDER BY id";
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -279,7 +279,7 @@ Display::display_header($tool_name);
//select of sessions
$sql = "SELECT id, name FROM $tbl_session ORDER BY name";
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -160,7 +160,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$where ";
//filtering the session list by access_url
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {

@ -152,7 +152,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
$form->addElement('header', null, get_lang($row['title']));
if ($row['access_url_changeable']=='1' && $_configuration['multiple_access_urls']==true) {
if ($row['access_url_changeable'] == '1' && $_configuration['multiple_access_urls']) {
$form->addElement('html', '<div style="float:right;">'.Display::return_icon('shared_setting.png',get_lang('SharedSettingIconComment')).'</div>');
}

@ -28,7 +28,7 @@ class Statistics {
$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT COUNT(*) AS number FROM ".$course_table." as c, ".$access_url_rel_course_table." as u WHERE u.course_code=c.code AND access_url_id='".$current_url_id."'";
if (isset ($category_code)) {
$sql .= " AND category_code = '".Database::escape_string($category_code)."'";
@ -61,7 +61,7 @@ class Statistics {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$status_filter = isset($status)?' AND status = '.intval($status):'';
$sql = "SELECT COUNT(DISTINCT(u.user_id)) AS number FROM $user_table as u, $access_url_rel_user_table as url WHERE u.user_id=url.user_id AND access_url_id='".$current_url_id."' $status_filter ";
@ -94,7 +94,7 @@ class Statistics {
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT count(default_id) AS total_number_of_items FROM $track_e_default, $table_user user, $access_url_rel_user_table url WHERE default_user_id = user.user_id AND user.user_id=url.user_id AND access_url_id='".$current_url_id."'";
} else {
$sql = "SELECT count(default_id) AS total_number_of_items FROM $track_e_default, $table_user user WHERE default_user_id = user.user_id ";
@ -127,7 +127,7 @@ class Statistics {
if (!in_array($direction, array('ASC','DESC'))) {
$direction = 'DESC';
}
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT
default_event_type as col0,
default_value_type as col1,
@ -260,7 +260,7 @@ class Statistics {
$table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$table_url = ", $access_url_rel_user_table";
$where_url = " WHERE login_user_id=user_id AND access_url_id='".$current_url_id."'";
} else {
@ -310,7 +310,7 @@ class Statistics {
$table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$table_url = ", $access_url_rel_user_table";
$where_url = " AND login_user_id=user_id AND access_url_id='".$current_url_id."'";
} else {
@ -345,7 +345,7 @@ class Statistics {
foreach ($tools as $tool) {
$tool_names[$tool] = get_lang(ucfirst($tool), '');
}
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT access_tool, count( access_id )
AS number_of_logins FROM $table, $access_url_rel_course_table
WHERE access_tool IN ('".implode("','",$tools)."') AND course_code = access_cours_code AND access_url_id='".$current_url_id."'
@ -371,7 +371,7 @@ class Statistics {
$table = Database :: get_main_table(TABLE_MAIN_COURSE);
$access_url_rel_course_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT course_language, count( c.code )
AS number_of_courses
FROM $table as c, $access_url_rel_course_table as u WHERE u.course_code=c.code AND access_url_id='".$current_url_id."' GROUP BY course_language";
@ -395,7 +395,7 @@ class Statistics {
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$url_condition = ", $access_url_rel_user_table as url WHERE url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
$url_condition2 = " AND url.user_id=u.user_id AND access_url_id='".$current_url_id."'";
$table = ", $access_url_rel_user_table as url ";
@ -486,7 +486,7 @@ class Statistics {
$values = $form->exportValues();
$date_diff = $values['date_diff'];
$table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS);
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT * FROM $table, $access_url_rel_course_table WHERE course_code = access_cours_code AND access_url_id='".$current_url_id."'
GROUP BY access_cours_code
HAVING access_cours_code <> ''
@ -542,7 +542,7 @@ class Statistics {
$field = 'user_receiver_id';
break;
}
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT lastname, firstname, username,
COUNT($field) AS count_message
FROM ".$access_url_rel_user_table." as url, ".$message_table." m
@ -577,7 +577,7 @@ class Statistics {
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$current_url_id = api_get_current_access_url_id();
if ($_configuration['multiple_access_urls'] == true){
if ($_configuration['multiple_access_urls']) {
$sql = "SELECT lastname, firstname, username,
COUNT(friend_user_id) AS count_friend
FROM ".$access_url_rel_user_table." as url, ".$user_friend_table." uf

@ -202,7 +202,7 @@ if ($use_extra_fields) {
}
$where_filter ='';
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " AND u.user_id IN ('".implode("','",$final_result)."') ";
} else {
@ -226,7 +226,7 @@ $sql = "SELECT user_id,lastname,firstname,username
ORDER BY ". (count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." ".$target_name;
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -244,7 +244,7 @@ unset($result);
$sql = "SELECT code,visual_code,title FROM $tbl_course WHERE visual_code LIKE '".$first_letter_course."%' ORDER BY ". (count($courses) > 0 ? "(code IN('".implode("','", $courses)."')) DESC," : "")." visual_code";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -260,7 +260,7 @@ $result = Database::query($sql);
$db_courses = Database::store_result($result);
unset($result);
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -368,7 +368,7 @@ if( $form->validate()) {
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$url = api_get_access_url($access_url_id);

@ -399,7 +399,7 @@ if ( $form->validate()) {
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$url = api_get_access_url($access_url_id);

@ -57,7 +57,7 @@ $courses[''] = '--';
$sql = "SELECT code,visual_code,title FROM $course_table ORDER BY visual_code";
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -104,7 +104,7 @@ if ($form->validate())
$filename = 'export_users_'.$course_code.'_'.date('Y-m-d_H-i-s');
} else {
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {

@ -285,7 +285,7 @@ else
* Show the URL in which this user is subscribed
*/
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
require_once(api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
$url_list= UrlManager::get_access_url_from_user($user['user_id']);
if (count($url_list) > 0) {

@ -322,7 +322,7 @@ function get_number_of_users()
// adding the filter to see the user's only of the current access_url
global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -382,7 +382,7 @@ function get_number_of_users()
}
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}
@ -421,7 +421,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
" FROM $user_table u ";
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -482,7 +482,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
}
// adding the filter to see the user's only of the current access_url
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}

@ -3049,9 +3049,9 @@ function get_agendaitems($month, $year) {
$result = Database::query($sqlquery);
global $_configuration;
$root_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
if ($access_url_id != -1 ) {
$url = api_get_access_url($access_url_id);
$root_url = $url['url'];
}

@ -608,9 +608,9 @@ function get_personal_agenda_items($agendaitems, $day = "", $month = "", $year =
global $_configuration;
$root_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
if ($access_url_id != -1 ) {
$url = api_get_access_url($access_url_id);
$root_url = $url['url'];
}

@ -2569,7 +2569,7 @@ function register_course($courseSysCode, $courseScreenCode, $courseRepository, $
//adding the course to an URL
global $_configuration;
require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_id=1;
if (api_get_current_access_url_id()!=-1) {
$url_id=api_get_current_access_url_id();

@ -51,7 +51,7 @@ class AddCourseToSession {
}
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -620,7 +620,7 @@ class CourseManager {
WHERE course_rel_user.user_id='$user_id' AND course_rel_user.status='1'
ORDER BY course.title";
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
@ -1502,7 +1502,7 @@ class CourseManager {
}
global $_configuration;
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
$url_id = 1;
if (api_get_current_access_url_id() != -1) {

@ -557,7 +557,7 @@ class GroupPortalManager
/*
global $_configuration;
if ($_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ($_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}*/

@ -28,7 +28,7 @@ function LoginCheck($uid) {
$reallyNow = time();
$login_date = date("Y-m-d H:i:s",$reallyNow);
$access_url_id = 1;
if ($_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ($_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_id = api_get_current_access_url_id();
}
$session_id = api_get_session_id();
@ -147,7 +147,7 @@ function who_is_online($valid, $friends = false) {
}*/
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
@ -216,7 +216,7 @@ function who_is_online_count($valid, $friends = false) {
}
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {

@ -380,7 +380,7 @@ class SessionManager {
$emailheaders = 'From: '.get_setting('administratorName').' '.get_setting('administratorSurname').' <'.get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.get_setting('emailAdministrator');
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);
@ -890,7 +890,7 @@ class SessionManager {
$result = @Database::query($sql);
while ($rows = Database::fetch_array($result)) {
$session_id = $rows['id'];
if($delete_session == true){
if ($delete_session == true){
if ($from_ws) {
SessionManager::delete_session($session_id,true);
} else {
@ -1179,7 +1179,7 @@ class SessionManager {
$sql_session = "SELECT session_id FROM $table_field sf INNER JOIN $t_sfv sfv ON sfv.field_id=sf.id WHERE field_variable='$original_session_id_name' AND field_value='$original_session_id_value'";
$res_session = Database::query($sql_session);
$row = Database::fetch_object($res_session);
if($row != false) {
if ($row != false) {
return $row->session_id;
} else {
return 0;

@ -197,7 +197,7 @@ class Tracking {
$rs = Database::query($sql);
if (Database::num_rows($rs)>0) {
if ($first_login_date = Database::result($rs, 0, 0)) {
if($convert_date == true) {
if ($convert_date == true) {
return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
} else {
return $first_login_date;
@ -237,13 +237,13 @@ class Tracking {
//If the last connection is > than 7 days, the text is red
//345600 = 7 days in seconds
if ($currentTimestamp - $timestamp > 604800) {
if($convert_date == true) {
if ($convert_date == true) {
return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . (api_is_allowed_to_edit()?' <a href="'.api_get_path(REL_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'" title="'.get_lang('RemindInactiveUser').'"><img align="middle" src="'.api_get_path(WEB_IMG_PATH).'messagebox_warning.gif" /></a>':'').'</span>';
} else {
return $last_login_date;
}
} else {
if($convert_date == true) {
if ($convert_date == true) {
return api_format_date($last_login_date, DATE_FORMAT_SHORT);
} else {
return $last_login_date;
@ -493,7 +493,7 @@ class Tracking {
}
// average progress = total sum divided by the number of views
// summed up.
if($return_array == false) {
if ($return_array == false) {
$avg_progress = round($sum / $number_items, 1);
return $avg_progress;
} else {
@ -733,7 +733,7 @@ class Tracking {
//var_dump($lp_with_quiz);
if ($lp_with_quiz != 0 ) {
if($return_array == false) {
if ($return_array == false) {
$score_of_scorm_calculate = round(($global_result/$lp_with_quiz),2);
return $score_of_scorm_calculate;
} else {
@ -875,7 +875,7 @@ class Tracking {
$sql = 'SELECT id_session, course_code FROM ' . $tbl_session_course_user . ' WHERE id_user=' . $coach_id.' AND status=2';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
@ -917,7 +917,7 @@ class Tracking {
INNER JOIN ' . $tbl_session . ' as session
ON session.id = session_course.id_session
AND session.id_coach = ' . $coach_id;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -1074,7 +1074,7 @@ class Tracking {
$sql = 'SELECT DISTINCT course_code FROM ' . $tbl_session_course_user . ' WHERE id_user=' . $coach_id.' AND status=2';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -1102,7 +1102,7 @@ class Tracking {
INNER JOIN ' . $tbl_course . ' as course
ON course.code = session_course.course_code';
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -1120,10 +1120,10 @@ class Tracking {
if (!empty ($id_session)) {
$sql .= ' WHERE session_course.id_session=' . $id_session;
if ($_configuration['multiple_access_urls']==true)
if ($_configuration['multiple_access_urls'])
$sql .= ' AND access_url_id = '.$access_url_id;
} else {
if ($_configuration['multiple_access_urls']==true)
if ($_configuration['multiple_access_urls'])
$sql .= ' WHERE access_url_id = '.$access_url_id;
}
@ -1156,7 +1156,7 @@ class Tracking {
WHERE id_coach=' . $coach_id;
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -1182,7 +1182,7 @@ class Tracking {
AND session_course_user.id_user=' . $coach_id.' AND session_course_user.status=2';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -133,7 +133,7 @@ class UserManager
$return = Database::insert_id();
global $_configuration;
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
if (api_get_current_access_url_id() != -1) {
UrlManager::add_user_to_url($return, api_get_current_access_url_id());
} else {
@ -428,7 +428,7 @@ class UserManager
$sql = "SELECT user_id FROM $t_uf uf INNER JOIN $t_ufv ufv ON ufv.field_id=uf.id WHERE field_variable='$original_user_id_name' AND field_value='$original_user_id_value';";
$res = Database::query($sql);
$row = Database::fetch_object($res);
if($row != false) {
if ($row != false) {
return $row->user_id;
} else {
return 0;
@ -1718,7 +1718,7 @@ class UserManager
//we filter the courses from the URL
$join_access_url=$where_access_url='';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if($access_url_id!=-1) {
$tbl_url_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@ -1808,7 +1808,7 @@ class UserManager
//we filter the courses from the URL
$join_access_url = $where_access_url = '';
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$tbl_url_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@ -1983,7 +1983,7 @@ class UserManager
//we filter the courses from the URL
$join_access_url=$where_access_url='';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if($access_url_id!=-1) {
$tbl_url_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@ -2726,7 +2726,7 @@ class UserManager
$keyword = $tag;
$sql = "SELECT u.user_id, u.username, firstname, lastname, email, picture_uri FROM $user_table u";
global $_configuration;
if ($_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ($_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -2746,7 +2746,7 @@ class UserManager
$sql .= " AND u.status <> 6 ";
// adding the filter to see the user's only of the current access_url
if ($_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ($_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}
$direction = 'ASC';
@ -2814,7 +2814,7 @@ class UserManager
// adding the filter to see the user's only of the current access_url
global $_configuration;
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ((api_is_platform_admin() || api_is_session_admin()) && $_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
}
@ -2831,7 +2831,7 @@ class UserManager
}
// adding the filter to see the user's only of the current access_url
if ($_configuration['multiple_access_urls']==true && api_get_current_access_url_id()!=-1) {
if ($_configuration['multiple_access_urls'] && api_get_current_access_url_id()!=-1) {
$sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
}
@ -2894,7 +2894,7 @@ class UserManager
//we filter the courses from the URL
$join_access_url=$where_access_url='';
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if($access_url_id!=-1) {
$tbl_url_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);

@ -272,7 +272,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
global $_configuration;
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$admin_table = Database::get_main_table(TABLE_MAIN_ADMIN);
//Check if user is an admin
@ -486,7 +486,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
global $_configuration;
//If Multiple URL is enabled
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$admin_table = Database::get_main_table(TABLE_MAIN_ADMIN);
//Check if user is an admin
$sql = "SELECT user_id FROM $admin_table

@ -193,7 +193,7 @@ else
}
?>
</head>
<body dir="<?php echo $text_dir ?>"
<body dir="<?php echo $text_dir; ?>">
<!-- #outerframe container to control some general layout of all pages -->
<div id="outerframe">
<?php

@ -657,7 +657,7 @@ if ($is_platform_admin && $view == 'admin' && $_GET['display'] != 'yourstudents'
WHERE scu.id_user=user_id AND scu.status=2 AND login_user_id=user_id
GROUP BY user_id ";
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
@ -684,7 +684,7 @@ if ($is_platform_admin && $view == 'admin' && $_GET['display'] != 'yourstudents'
GROUP BY user_id
ORDER BY login_date '.$tracking_direction;
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
$tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {

@ -351,7 +351,7 @@ if ($form->validate()) {
$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$url = api_get_access_url($access_url_id);

@ -125,7 +125,7 @@ function search_users($needle,$type) {
}
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
@ -266,7 +266,7 @@ if ($ajax_search) {
ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id ".
$order_clause;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){

@ -192,7 +192,7 @@ function get_number_of_users() {
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".api_get_course_id()."' AND id_session ='".api_get_session_id()."'
WHERE cu.id_user IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -211,7 +211,7 @@ function get_number_of_users() {
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".api_get_course_id()."'
WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -235,7 +235,7 @@ function get_number_of_users() {
FROM $user_table u
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".api_get_course_id()."' AND id_session ='".api_get_session_id()."'
WHERE cu.id_user IS NULL AND u.status<>".DRH." AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -266,7 +266,7 @@ function get_number_of_users() {
$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
}
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {
@ -397,7 +397,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
}
// adding a teacher NOT trough a session on a portal with multiple URLs
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {
$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -491,7 +491,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
//showing only the courses of the current Dokeos access_url_id
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {

@ -183,7 +183,7 @@ if($register) {
$email_admin = api_get_setting('emailAdministrator');
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1 ){
$url = api_get_access_url($access_url_id);

@ -261,7 +261,7 @@ function WSCreateUsers($params) {
//echo "id returned";
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
if (api_get_current_access_url_id() != -1) {
UrlManager::add_user_to_url($return, api_get_current_access_url_id());
} else {
@ -461,7 +461,7 @@ function WSCreateUser($params) {
//echo "id returned";
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
if (api_get_current_access_url_id() != -1) {
UrlManager::add_user_to_url($return, api_get_current_access_url_id());
} else {
@ -746,7 +746,7 @@ function WSCreateUsersPasswordCrypted($params) {
//echo "id returned";
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
if (api_get_current_access_url_id() != -1) {
UrlManager::add_user_to_url($return, api_get_current_access_url_id());
} else {
@ -969,7 +969,7 @@ function WSCreateUserPasswordCrypted($params) {
//echo "id returned";
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if ($_configuration['multiple_access_urls']) {
if (api_get_current_access_url_id() != -1) {
UrlManager::add_user_to_url($return, api_get_current_access_url_id());
} else {

@ -454,7 +454,7 @@ function display_courses_in_category($user_category_id) {
AND course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH."
AND course_rel_user.user_course_cat='".$user_category_id."' $without_special_courses ";
if ($_configuration['multiple_access_urls'] == true && $current_url_id!=-1){
if ($_configuration['multiple_access_urls'] && $current_url_id != -1){
$sql_select_courses .= " AND url.course_code=course.code AND access_url_id='".$current_url_id."'";
}
$sql_select_courses .= " ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
@ -1642,7 +1642,7 @@ echo '<div class="clear"></div>';
echo '<div id="social_widget">';
echo ' <div id="social_widget_image">';
if (api_get_setting('allow_social_tool')=='true') {
if (api_get_setting('allow_social_tool') == 'true') {
if ($no_image == false) {
echo '<a href="'.api_get_path(WEB_PATH).'main/social/home.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
} else {

Loading…
Cancel
Save