|
@@ -223,8 +223,8 @@ function get_number_of_users() {
|
|
|
} else {
|
|
|
$sql = "SELECT u.user_id
|
|
|
FROM $user_table u
|
|
|
- LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'
|
|
|
- WHERE cu.user_id IS NULL";
|
|
|
+ LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
|
|
|
|
|
|
if ($_configuration['multiple_access_urls']==true) {
|
|
|
$url_access_id = api_get_current_access_url_id();
|
|
@@ -237,7 +237,7 @@ function get_number_of_users() {
|
|
|
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'
|
|
|
INNER JOIN $tbl_url_rel_user as url_rel_user
|
|
|
ON (url_rel_user.user_id = u.user_id)
|
|
|
- WHERE cu.user_id IS NULL AND access_url_id= $url_access_id ";
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -250,7 +250,7 @@ function get_number_of_users() {
|
|
|
u.user_id
|
|
|
FROM $user_table u
|
|
|
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."' AND id_session ='".$_SESSION["id_session"]."'
|
|
|
- WHERE cu.id_user IS NULL AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
|
|
|
+ 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) {
|
|
|
$url_access_id = api_get_current_access_url_id();
|
|
|
if ($url_access_id !=-1) {
|
|
@@ -261,7 +261,7 @@ function get_number_of_users() {
|
|
|
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."' AND id_session ='".$_SESSION["id_session"]."'
|
|
|
INNER JOIN $tbl_url_rel_user as url_rel_user
|
|
|
ON (url_rel_user.user_id = u.user_id)
|
|
|
- WHERE cu.user_id IS NULL AND access_url_id= $url_access_id AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -278,11 +278,11 @@ function get_number_of_users() {
|
|
|
$sql .= "
|
|
|
LEFT JOIN $table_user_field_values field_values
|
|
|
ON field_values.user_id = u.user_id
|
|
|
- WHERE cu.user_id IS NULL
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH."
|
|
|
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
|
|
|
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
|
|
|
} else {
|
|
|
- $sql .= "WHERE cu.user_id IS NULL";
|
|
|
+ $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
|
|
|
}
|
|
|
|
|
|
if ($_configuration['multiple_access_urls']==true) {
|
|
@@ -296,7 +296,7 @@ function get_number_of_users() {
|
|
|
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'
|
|
|
INNER JOIN $tbl_url_rel_user as url_rel_user
|
|
|
ON (url_rel_user.user_id = u.user_id)
|
|
|
- WHERE cu.user_id IS NULL AND access_url_id= $url_access_id ";
|
|
|
+ WHERE cu.user_id IS NULL AND access_url_id= $url_access_id AND u.status<>".DRH." ";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -346,7 +346,7 @@ function get_number_of_users() {
|
|
|
* Get the users to display on the current page.
|
|
|
*/
|
|
|
function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
- global $_course;
|
|
|
+ global $_course, $_configuration;;
|
|
|
|
|
|
// Database table definitions
|
|
|
$user_table = Database :: get_main_table(TABLE_MAIN_USER);
|
|
@@ -407,15 +407,13 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
$sql .= "
|
|
|
LEFT JOIN $table_user_field_values field_values
|
|
|
ON field_values.user_id = u.user_id
|
|
|
- WHERE cu.user_id IS NULL
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH."
|
|
|
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
|
|
|
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
|
|
|
} else {
|
|
|
- $sql .= "WHERE cu.user_id IS NULL";
|
|
|
+ $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
|
|
|
}
|
|
|
- //showing only the courses of the current Dokeos access_url_id
|
|
|
- global $_configuration;
|
|
|
-
|
|
|
+
|
|
|
// adding a teacher NOT trough a session on a portal with multiple URLs
|
|
|
if ($_configuration['multiple_access_urls']==true) {
|
|
|
$url_access_id = api_get_current_access_url_id();
|
|
@@ -434,10 +432,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
u.user_id AS col6
|
|
|
FROM $user_table u
|
|
|
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'
|
|
|
- INNER JOIN $tbl_url_rel_user as url_rel_user
|
|
|
- ON (url_rel_user.user_id = u.user_id)
|
|
|
- WHERE cu.user_id IS NULL AND access_url_id= $url_access_id ";
|
|
|
-
|
|
|
+ INNER JOIN $tbl_url_rel_user as url_rel_user ON (url_rel_user.user_id = u.user_id) ";
|
|
|
|
|
|
// applying the filter of the additional user profile fields
|
|
|
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
|
|
@@ -445,11 +440,11 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
$sql .= "
|
|
|
LEFT JOIN $table_user_field_values field_values
|
|
|
ON field_values.user_id = u.user_id
|
|
|
- WHERE cu.user_id IS NULL
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH."
|
|
|
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
|
|
|
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
|
|
|
} else {
|
|
|
- $sql .= "WHERE cu.user_id IS NULL AND access_url_id= $url_access_id ";
|
|
|
+ $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -477,13 +472,14 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
$sql .= "
|
|
|
LEFT JOIN $table_user_field_values field_values
|
|
|
ON field_values.user_id = u.user_id
|
|
|
- WHERE cu.id_user IS NULL AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL)
|
|
|
+ WHERE cu.id_user IS NULL AND u.status<>".DRH." AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL)
|
|
|
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
|
|
|
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
|
|
|
} else {
|
|
|
- $sql .= "WHERE cu.id_user IS NULL AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
|
|
|
+ $sql .= "WHERE cu.id_user IS NULL AND u.status<>".DRH." AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
|
|
|
}
|
|
|
} else {
|
|
|
+
|
|
|
$sql = "SELECT
|
|
|
u.user_id AS col0,
|
|
|
u.official_code AS col1,
|
|
@@ -504,11 +500,11 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
$sql .= "
|
|
|
LEFT JOIN $table_user_field_values field_values
|
|
|
ON field_values.user_id = u.user_id
|
|
|
- WHERE cu.user_id IS NULL
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH."
|
|
|
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
|
|
|
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
|
|
|
} else {
|
|
|
- $sql .= "WHERE cu.user_id IS NULL";
|
|
|
+ $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
|
|
|
}
|
|
|
|
|
|
//showing only the courses of the current Dokeos access_url_id
|
|
@@ -532,7 +528,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'
|
|
|
INNER JOIN $tbl_url_rel_user as url_rel_user
|
|
|
ON (url_rel_user.user_id = u.user_id)
|
|
|
- WHERE cu.user_id IS NULL AND access_url_id= $url_access_id ";
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
|
|
|
|
|
|
|
|
|
// applying the filter of the additional user profile fields
|
|
@@ -541,11 +537,11 @@ function get_user_data($from, $number_of_items, $column, $direction) {
|
|
|
$sql .= "
|
|
|
LEFT JOIN $table_user_field_values field_values
|
|
|
ON field_values.user_id = u.user_id
|
|
|
- WHERE cu.user_id IS NULL
|
|
|
+ WHERE cu.user_id IS NULL AND u.status<>".DRH."
|
|
|
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
|
|
|
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
|
|
|
} else {
|
|
|
- $sql .= "WHERE cu.user_id IS NULL AND access_url_id= $url_access_id ";
|
|
|
+ $sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
|
|
|
}
|
|
|
|
|
|
}
|