if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
$sql = "SELECT u.user_id
$sql = "SELECT u.user_id
FROM $user_table u
FROM $user_table u
@ -228,7 +230,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']."'";
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
// we change the SQL when we have a filter
// we change the SQL when we have a filter
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
$sql .= " AND (firstname LIKE '%".$keyword."%' OR lastname LIKE '%".$keyword."%' OR email LIKE '%".$keyword."%' OR username LIKE '%".$keyword."%' OR official_code LIKE '%".$keyword."%')";
$sql .= " AND (firstname LIKE '%".$keyword."%' OR lastname LIKE '%".$keyword."%' OR email LIKE '%".$keyword."%' OR username LIKE '%".$keyword."%' OR official_code LIKE '%".$keyword."%')";
@ -333,7 +335,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
// applying the filter of the additional user profile fields
// applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
if (isset($_GET['subscribe_user_filter_value']) !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
@ -341,8 +343,8 @@ function get_user_data($from, $number_of_items, $column, $direction) {
WHERE cu.user_id IS NULL
WHERE cu.user_id IS NULL
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
} else {
} else {
$sql .= "WHERE cu.user_id IS NULL";
$sql .= "WHERE cu.user_id IS NULL";
}
}
} else {
} else {
// adding a teacher NOT through a session
// adding a teacher NOT through a session
@ -361,7 +363,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']."'";
LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
// applying the filter of the additional user profile fields
// applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
@ -374,8 +376,8 @@ function get_user_data($from, $number_of_items, $column, $direction) {
}
}
//showing only the courses of the current Dokeos access_url_id
//showing only the courses of the current Dokeos access_url_id
global $_configuration;
global $_configuration;
// adding a teacher NOT trough a session on a portal with multiple URLs
// adding a teacher NOT trough a session on a portal with multiple URLs
if ($_configuration['multiple_access_urls']==true) {
if ($_configuration['multiple_access_urls']==true) {
$url_access_id = api_get_current_access_url_id();
$url_access_id = api_get_current_access_url_id();
if ($url_access_id !=-1) {
if ($url_access_id !=-1) {
@ -399,7 +401,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
// applying the filter of the additional user profile fields
// applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
AND field_values.field_id = '".Database::escape_string($field_identification[0])."'
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
} else {
} else {
$sql .= "WHERE cu.user_id IS NULL";
$sql .= "WHERE cu.user_id IS NULL";
}
}
//showing only the courses of the current Dokeos access_url_id
//showing only the courses of the current Dokeos access_url_id
global $_configuration;
global $_configuration;
@ -495,7 +497,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
// applying the filter of the additional user profile fields
// applying the filter of the additional user profile fields
if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){