From e49f68df468735daaf511284cf64310b507d9e1d Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Fri, 12 Feb 2010 16:20:52 +0200 Subject: [PATCH] Feature #347 - Platform administration tool: All "magic" parameters __FILE__ and __LINE__, passed within the method Database::query() have been removed. They are not needed anymore, the method Database::query() has been upgraded to retrieve alone the corresponding values needed for error message creation. --- main/admin/access_url_add_courses_to_url.php | 6 +- main/admin/access_url_add_sessions_to_url.php | 6 +- main/admin/access_url_add_users_to_url.php | 6 +- main/admin/access_url_edit_courses_to_url.php | 2 +- .../admin/access_url_edit_sessions_to_url.php | 2 +- main/admin/access_url_edit_users_to_url.php | 2 +- main/admin/add_courses_to_session.php | 18 +- main/admin/add_many_session_to_category.php | 10 +- main/admin/add_users_to_group.php | 184 +++++++++--------- main/admin/add_users_to_session.php | 16 +- main/admin/calendar.lib.php | 64 +++--- main/admin/calendar.php | 12 +- main/admin/calendar_view_print.php | 2 +- main/admin/class_list.php | 4 +- main/admin/class_user_import.php | 8 +- main/admin/configure_extensions.php | 40 ++-- main/admin/configure_homepage.php | 2 +- main/admin/course_add.php | 4 +- main/admin/course_category.php | 46 ++--- main/admin/course_edit.php | 28 +-- main/admin/course_import.php | 32 +-- main/admin/course_information.php | 8 +- main/admin/course_list.php | 6 +- main/admin/course_user_import.php | 6 +- main/admin/course_virtual.php | 2 +- main/admin/group_edit.php | 16 +- main/admin/group_list.php | 46 ++--- main/admin/index.php | 28 +-- main/admin/languages.php | 6 +- .../admin/ldap_import_students_to_session.php | 6 +- main/admin/ldap_synchro.php | 18 +- main/admin/resume_session.php | 34 ++-- main/admin/session_add.php | 8 +- main/admin/session_category_edit.php | 2 +- main/admin/session_category_list.php | 6 +- main/admin/session_course_edit.php | 8 +- main/admin/session_course_list.php | 10 +- main/admin/session_course_user.php | 16 +- main/admin/session_course_user_list.php | 8 +- main/admin/session_edit.php | 6 +- main/admin/session_export.php | 14 +- main/admin/session_import.php | 86 ++++---- main/admin/session_list.php | 76 ++++---- main/admin/settings.php | 40 ++-- main/admin/special_exports.php | 12 +- main/admin/statistics/statistics.lib.php | 34 ++-- main/admin/sub_language.class.php | 20 +- main/admin/sub_language_add.php | 10 +- main/admin/subscribe_class2course.php | 4 +- main/admin/subscribe_user2class.php | 6 +- main/admin/subscribe_user2course.php | 6 +- main/admin/user_add.php | 4 +- main/admin/user_edit.php | 6 +- main/admin/user_export.php | 4 +- main/admin/user_fields.php | 16 +- main/admin/user_fields_options.php | 10 +- main/admin/user_information.php | 16 +- main/admin/user_list.php | 32 +-- 58 files changed, 565 insertions(+), 565 deletions(-) diff --git a/main/admin/access_url_add_courses_to_url.php b/main/admin/access_url_add_courses_to_url.php index dd62335283..118ef42681 100755 --- a/main/admin/access_url_add_courses_to_url.php +++ b/main/admin/access_url_add_courses_to_url.php @@ -115,7 +115,7 @@ if ($_POST['form_sent']) { if(empty($first_letter_user)) { $sql = "SELECT count(*) as num_courses FROM $tbl_course"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $num_row = Database::fetch_array($result); if($num_row['num_courses']>1000) {//if there are too much num_courses to gracefully handle with the HTML select list, @@ -130,12 +130,12 @@ $sql = "SELECT code, title FROM $tbl_course WHERE title LIKE '".$first_letter_course."%' OR title LIKE '".api_strtolower($first_letter_course)."%' ORDER BY title, code DESC "; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_courses = Database::store_result($result); unset($result); $sql = "SELECT id, url FROM $tbl_access_url WHERE active=1 ORDER BY url"; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_urls = Database::store_result($result); unset($result); ?> diff --git a/main/admin/access_url_add_sessions_to_url.php b/main/admin/access_url_add_sessions_to_url.php index c5ac052ee3..2b65c670b4 100755 --- a/main/admin/access_url_add_sessions_to_url.php +++ b/main/admin/access_url_add_sessions_to_url.php @@ -113,7 +113,7 @@ if ($_POST['form_sent']) { /* if(empty($first_letter_user)) { $sql = "SELECT count(*) as num_courses FROM $tbl_course"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $num_row = Database::fetch_array($result); if($num_row['num_courses']>1000) {//if there are too much num_courses to gracefully handle with the HTML select list, @@ -128,12 +128,12 @@ $sql = "SELECT id, name FROM $tbl_session WHERE name LIKE '".$first_letter_session."%' OR name LIKE '".api_strtolower($first_letter_session)."%' ORDER BY name DESC "; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_sessions = Database::store_result($result); unset($result); $sql = "SELECT id, url FROM $tbl_access_url WHERE active=1 ORDER BY url"; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_urls = Database::store_result($result); unset($result); ?> diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php index 92619d43d0..f4bd5f1e87 100755 --- a/main/admin/access_url_add_users_to_url.php +++ b/main/admin/access_url_add_users_to_url.php @@ -118,7 +118,7 @@ if ($_POST['form_sent']) { if(empty($first_letter_user)) { $sql = "SELECT count(*) as nb_users FROM $tbl_user"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $num_row = Database::fetch_array($result); if($num_row['nb_users']>1000) { //if there are too much users to gracefully handle with the HTML select list, @@ -133,12 +133,12 @@ $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname'; $sql = "SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE ".$target_name." LIKE '".$first_letter_user."%' OR ".$target_name." LIKE '".api_strtolower($first_letter_user)."%' ORDER BY ". (count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." ".$target_name; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_users = Database::store_result($result); unset($result); $sql = "SELECT id, url FROM $tbl_access_url WHERE active=1 ORDER BY url"; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_urls = Database::store_result($result); unset($result); ?> diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php index 337200dbbe..353c7dfbd2 100755 --- a/main/admin/access_url_edit_courses_to_url.php +++ b/main/admin/access_url_edit_courses_to_url.php @@ -165,7 +165,7 @@ if($ajax_search) { $sql="SELECT code, title FROM $tbl_course u ORDER BY title, code"; - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $courses=Database::store_result($result); $course_list_leys = array_keys($course_list); foreach($courses as $course) { diff --git a/main/admin/access_url_edit_sessions_to_url.php b/main/admin/access_url_edit_sessions_to_url.php index 6b241839d6..69a505d53b 100755 --- a/main/admin/access_url_edit_sessions_to_url.php +++ b/main/admin/access_url_edit_sessions_to_url.php @@ -164,7 +164,7 @@ if($ajax_search) { $sql="SELECT id, name FROM $tbl_session u ORDER BY name, id"; - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $sessions=Database::store_result($result); $session_list_leys = array_keys($session_list); foreach($sessions as $session) { diff --git a/main/admin/access_url_edit_users_to_url.php b/main/admin/access_url_edit_users_to_url.php index 487082b4a4..a7d47dd1e5 100755 --- a/main/admin/access_url_edit_users_to_url.php +++ b/main/admin/access_url_edit_users_to_url.php @@ -159,7 +159,7 @@ if($ajax_search) { $sql="SELECT u.user_id, lastname, firstname, username FROM $tbl_user u". $order_clause; - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $Users=Database::store_result($result); $user_list_leys = array_keys($sessionUsersList); foreach($Users as $user) { diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php index fe5c634404..6f7b9a30ea 100755 --- a/main/admin/add_courses_to_session.php +++ b/main/admin/add_courses_to_session.php @@ -54,7 +54,7 @@ if(isset($_GET['add_type']) && $_GET['add_type']!=''){ if (!api_is_platform_admin()) { $sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session; - $rs = Database::query($sql,__FILE__,__LINE__); + $rs = Database::query($sql); if (Database::result($rs,0,0)!=$_user['user_id']) { api_not_allowed(true); } @@ -122,7 +122,7 @@ if ($_POST['formSent']) { $sql="SELECT id_user FROM $tbl_session_rel_user WHERE id_session = $id_session"; - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $UserList=Database::store_result($result); @@ -136,19 +136,19 @@ if ($_POST['formSent']) { } if(!$exists) { $sql_insert_rel_course= "INSERT INTO $tbl_session_rel_course(id_session,course_code) VALUES('$id_session','$enreg_course')"; - Database::query($sql_insert_rel_course ,__FILE__,__LINE__); + Database::query($sql_insert_rel_course ); //We add in the existing courses table the current course, to not try to add another time the current course $existingCourses[]=array('course_code'=>$enreg_course); $nbr_users=0; foreach ($UserList as $enreg_user) { $enreg_user = Database::escape_string($enreg_user['id_user']); $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$enreg_course','$enreg_user')"; - Database::query($sql_insert,__FILE__,__LINE__); + Database::query($sql_insert); if(Database::affected_rows()) { $nbr_users++; } } - Database::query("UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users WHERE id_session='$id_session' AND course_code='$enreg_course'",__FILE__,__LINE__); + Database::query("UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users WHERE id_session='$id_session' AND course_code='$enreg_course'"); } } @@ -161,7 +161,7 @@ if ($_POST['formSent']) { } } $nbr_courses=count($CourseList); - Database::query("UPDATE $tbl_session SET nbr_courses=$nbr_courses WHERE id='$id_session'",__FILE__,__LINE__); + Database::query("UPDATE $tbl_session SET nbr_courses=$nbr_courses WHERE id='$id_session'"); if(isset($_GET['add'])) header('Location: add_users_to_session.php?id_session='.$id_session.'&add=true'); @@ -196,7 +196,7 @@ echo '
'.$tool_name.' ('.$session_info[ /*$sql = 'SELECT COUNT(1) FROM '.$tbl_course; -$rs = Database::query($sql, __FILE__, __LINE__); +$rs = Database::query($sql); $count_courses = Database::result($rs, 0, 0);*/ $ajax_search = $add_type == 'unique' ? true : false; @@ -227,7 +227,7 @@ if ($ajax_search) { } } - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $Courses=Database::store_result($result); foreach($Courses as $course) { @@ -257,7 +257,7 @@ if ($ajax_search) { } } - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $Courses=Database::store_result($result); foreach($Courses as $course) { if ($course['id_session'] == $id_session) { diff --git a/main/admin/add_many_session_to_category.php b/main/admin/add_many_session_to_category.php index dbe43aa4d2..e0ba8b488c 100755 --- a/main/admin/add_many_session_to_category.php +++ b/main/admin/add_many_session_to_category.php @@ -52,7 +52,7 @@ if(isset($_GET['add_type']) && $_GET['add_type']!=''){ if (!api_is_platform_admin()) { $sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session; - $rs = Database::query($sql,__FILE__,__LINE__); + $rs = Database::query($sql); if (Database::result($rs,0,0)!=$_user['user_id']) { api_not_allowed(true); } @@ -106,7 +106,7 @@ if ($_POST['formSent']) { if($Categoryid != 0 && count($SessionCategoryList)>0 ){ $session_id = join(',', $SessionCategoryList); $sql = "UPDATE $tbl_session SET session_category_id = $Categoryid WHERE id in ($session_id) "; - Database::query($sql,__FILE__,__LINE__); + Database::query($sql); header('Location: session_list.php?id_category='.$Categoryid); } else { header('Location: add_many_session_to_category.php?msg=error'); @@ -127,16 +127,16 @@ $rows_category_session = array(); if(isset($_POST['CategorySessionId']) && $_POST['formSent'] == 0 ){ $where = 'WHERE session_category_id !='.intval($_POST['CategorySessionId']); $sql = 'SELECT id, name FROM '.$tbl_session .' WHERE session_category_id ='.intval($_POST['CategorySessionId']).' ORDER BY name'; - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $rows_category_session = Database::store_result($result); } $sql = "SELECT id, name FROM $tbl_session_category ORDER BY name"; -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); $rows_session_category = Database::store_result($result); $sql = "SELECT id, name FROM $tbl_session $where ORDER BY name"; -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); $rows_session = Database::store_result($result); ?>
> diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php index 603ebb6e1c..d3b65a1f3f 100755 --- a/main/admin/add_users_to_group.php +++ b/main/admin/add_users_to_group.php @@ -55,47 +55,47 @@ function search_users($needle,$type,$relation_type) { $group_id = intval($group_id); $relation_type = intval($relation_type); // get user_id from relation type and group id - $sql = "SELECT user_id FROM $tbl_group_rel_user + $sql = "SELECT user_id FROM $tbl_group_rel_user WHERE group_id = '$group_id' AND relation_type IN (".GROUP_USER_PERMISSION_ADMIN.",".GROUP_USER_PERMISSION_READER.",".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_MODERATOR.") "; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $user_ids = array(); - if (Database::num_rows($res) > 0) { + if (Database::num_rows($res) > 0) { while ($row = Database::fetch_row($res)) { $user_ids[] = $row[0]; } $without_user_id = " AND user_id NOT IN(".implode(',',$user_ids).") "; } - + if ($relation_type==GROUP_USER_PERMISSION_PENDING_INVITATION) { - $condition_relation = " AND groups.relation_type IN (".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_READER.") "; + $condition_relation = " AND groups.relation_type IN (".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_READER.") "; } else { $condition_relation = " AND groups.relation_type = '$relation_type' "; } - // data for destination user list - $sql = "SELECT user.user_id, user.username, user.lastname, user.firstname + // data for destination user list + $sql = "SELECT user.user_id, user.username, user.lastname, user.firstname FROM $tbl_group_rel_user groups INNER JOIN $tbl_user user ON user.user_id = groups.user_id - WHERE groups.group_id = '$group_id' $condition_relation "; - - $rs_destination = Database::query($sql,__FILE__,__LINE__); + WHERE groups.group_id = '$group_id' $condition_relation "; + + $rs_destination = Database::query($sql); if (Database::num_rows($rs_destination) > 0) { $return_destination .= ''; + $return_destination .= ''; } else { $return_destination .= ''; } $xajax_response -> addAssign('ajax_destination_list','innerHTML',api_utf8_encode($return_destination)); - + } else { $return_destination .= ''; $xajax_response -> addAssign('ajax_destination_list','innerHTML',api_utf8_encode($return_destination)); - + if ($type == 'single') { $return.= ''; $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); @@ -104,24 +104,24 @@ function search_users($needle,$type,$relation_type) { $xajax_response -> addAssign('ajax_origin_list_multiple','innerHTML',api_utf8_encode($return_origin)); } } - + if (!empty($needle) && !empty($type)) { // xajax send utf8 datas... datas in db can be non-utf8 datas $charset = api_get_setting('platform_charset'); $needle = Database::escape_string($needle); $needle = api_convert_encoding($needle, $charset, 'utf-8'); - $user_anonymous=api_get_anonymous_id(); + $user_anonymous=api_get_anonymous_id(); $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); - - $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; - if ($type == 'single') { - if (!empty($group_id) && !empty($relation_type)) { + + $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; + if ($type == 'single') { + if (!empty($group_id) && !empty($relation_type)) { // search users where username or firstname or lastname begins likes $needle $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']==true) { $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 @@ -130,7 +130,7 @@ function search_users($needle,$type,$relation_type) { AND user.user_id<>'$user_anonymous' $without_user_id $order_clause LIMIT 11 "; } } - $rs_single = Database::query($sql, __FILE__, __LINE__); + $rs_single = Database::query($sql); $i=0; while ($user = Database :: fetch_array($rs_single)) { $i++; @@ -141,37 +141,37 @@ function search_users($needle,$type,$relation_type) { $return .= '...
'; } } - $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); + $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); } else { $xajax_response ->addAlert(get_lang('YouMustChooseARelationType')); $xajax_response->addClear('user_to_add', 'value'); } - + } else { // multiple 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']==true) { $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 INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=user.user_id) WHERE access_url_id = '$access_url_id' - AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' + AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user.user_id<>'$user_anonymous' $without_user_id $order_clause "; } } - $rs_multiple = Database::query($sql, __FILE__, __LINE__); - $return_origin .= ''; while ($user = Database :: fetch_array($rs_multiple)) { $person_name = api_get_person_name($user['firstname'], $user['lastname']); $return_origin .= ''; } - $return_origin .= ''; + $return_origin .= ''; $xajax_response -> addAssign('ajax_origin_list_multiple','innerHTML',api_utf8_encode($return_origin)); - } - } + } + } } return $xajax_response; } @@ -223,33 +223,33 @@ $users=$sessions=array(); $noPHP_SELF=true; $group_info = GroupPortalManager::get_group_data($group_id); -$group_name = $group_info['name']; +$group_name = $group_info['name']; Display::display_header($group_name); if($_POST['form_sent']) { - + $form_sent = $_POST['form_sent']; - $firstLetterUser = $_POST['firstLetterUser']; + $firstLetterUser = $_POST['firstLetterUser']; $UserList = $_POST['sessionUsersList']; $group_id = intval($_POST['id']); $relation_type = intval($_POST['relation']); - + if(!is_array($UserList)) { $UserList=array(); } if ($form_sent == 1) { - if ($relation_type == GROUP_USER_PERMISSION_PENDING_INVITATION) { + if ($relation_type == GROUP_USER_PERMISSION_PENDING_INVITATION) { $relations = array(GROUP_USER_PERMISSION_PENDING_INVITATION,GROUP_USER_PERMISSION_READER); $users_by_group = GroupPortalManager::get_users_by_group($group_id,null,$relations); - $user_id_relation = array_keys($users_by_group); + $user_id_relation = array_keys($users_by_group); $user_relation_diff = array_diff($user_id_relation,$UserList); foreach ($user_relation_diff as $user_id) { GroupPortalManager::delete_user_rel_group($user_id,$group_id); } } else { - GroupPortalManager::delete_users($group_id, $relation_type); - } + GroupPortalManager::delete_users($group_id, $relation_type); + } $result = GroupPortalManager::add_users_to_groups($UserList, array($group_id), $relation_type); Display :: display_confirmation_message(get_lang('UsersEdited')); } @@ -261,110 +261,110 @@ $ajax_search = $add_type == 'unique' ? true : false; $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; if ($ajax_search) { - - // data for destination list + + // data for destination list if (isset($_POST['id']) && isset($_POST['relation'])) { - // data for destination user list + // data for destination user list $id = intval($_POST['id']); $relation_type = intval($_POST['relation']); $condition_relation = ""; - + if ($relation_type==GROUP_USER_PERMISSION_PENDING_INVITATION) { - $condition_relation = " AND groups.relation_type IN (".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_READER.") "; + $condition_relation = " AND groups.relation_type IN (".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_READER.") "; } else { $condition_relation = " AND groups.relation_type = '$relation_type' "; } - - $sql = "SELECT user.user_id, user.username, user.lastname, user.firstname + + $sql = "SELECT user.user_id, user.username, user.lastname, user.firstname FROM $tbl_group_rel_user groups INNER JOIN $tbl_user user ON user.user_id = groups.user_id - WHERE groups.group_id = '$id' $condition_relation "; - $rs_destination = Database::query($sql,__FILE__,__LINE__); - if (Database::num_rows($rs_destination) > 0) { - while ($row_destination_list = Database::fetch_array($rs_destination)) { - $sessionUsersList[$row_destination_list['user_id']] = $row_destination_list ; - } - } + WHERE groups.group_id = '$id' $condition_relation "; + $rs_destination = Database::query($sql); + if (Database::num_rows($rs_destination) > 0) { + while ($row_destination_list = Database::fetch_array($rs_destination)) { + $sessionUsersList[$row_destination_list['user_id']] = $row_destination_list ; + } + } } } else { - - $many_users = false; + + $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']==true) { $access_url_id = api_get_current_access_url_id(); if ($access_url_id != -1) { $sql = "SELECT count(user.user_id) FROM $tbl_user user INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=user.user_id) WHERE access_url_id = '$access_url_id' - AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' + AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user.user_id<>'$user_anonymous' $without_user_id "; } - } - $rs_count = Database::query($sql,__FILE__,__LINE__); - $row_count = Database::fetch_row($rs_count); + } + $rs_count = Database::query($sql); + $row_count = Database::fetch_row($rs_count); if ($row_count > 2) $many_users = true; - - // data for origin list - if (isset($_POST['id']) && isset($_POST['firstLetterUser'])) { + + // data for origin list + if (isset($_POST['id']) && isset($_POST['firstLetterUser'])) { $id = intval($_POST['id']); $needle = Database::escape_string($_POST['firstLetterUser']); $needle = api_convert_encoding($needle, $charset, 'utf-8'); $user_anonymous=api_get_anonymous_id(); // get user_id from relation type and group id - $sql = "SELECT user_id FROM $tbl_group_rel_user + $sql = "SELECT user_id FROM $tbl_group_rel_user WHERE group_id = '$id' AND relation_type IN (".GROUP_USER_PERMISSION_ADMIN.",".GROUP_USER_PERMISSION_READER.",".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_MODERATOR.") "; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $user_ids = array(); - if (Database::num_rows($res) > 0) { + if (Database::num_rows($res) > 0) { while ($row = Database::fetch_row($res)) { $user_ids[] = $row[0]; } $without_user_id = " AND user_id NOT IN(".implode(',',$user_ids).") "; } - + $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']==true) { $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 INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=user.user_id) WHERE access_url_id = '$access_url_id' - AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' + AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user.user_id<>'$user_anonymous' $without_user_id $order_clause "; } } - $rs_origin_list = Database::query($sql, __FILE__, __LINE__); + $rs_origin_list = Database::query($sql); while ($row_origin_list = Database::fetch_array($rs_origin_list)) { $nosessionUsersList[$row_origin_list['user_id']] = $row_origin_list; - } + } } - - // data for destination list + + // data for destination list if (isset($_POST['id']) && isset($_POST['relation'])) { - // data for destination user list + // data for destination user list $id = intval($_POST['id']); $relation_type = intval($_POST['relation']); if ($relation_type==GROUP_USER_PERMISSION_PENDING_INVITATION) { - $condition_relation = " AND groups.relation_type IN (".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_READER.") "; + $condition_relation = " AND groups.relation_type IN (".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_READER.") "; } else { $condition_relation = " AND groups.relation_type = '$relation_type' "; } - - $sql = "SELECT user.user_id, user.username, user.lastname, user.firstname + + $sql = "SELECT user.user_id, user.username, user.lastname, user.firstname FROM $tbl_group_rel_user groups INNER JOIN $tbl_user user ON user.user_id = groups.user_id - WHERE groups.group_id = '$id' $condition_relation "; - $rs_destination = Database::query($sql,__FILE__,__LINE__); - if (Database::num_rows($rs_destination) > 0) { - while ($row_destination_list = Database::fetch_array($rs_destination)) { - $sessionUsersList[$row_destination_list['user_id']] = $row_destination_list ; - } - } + WHERE groups.group_id = '$id' $condition_relation "; + $rs_destination = Database::query($sql); + if (Database::num_rows($rs_destination) > 0) { + while ($row_destination_list = Database::fetch_array($rs_destination)) { + $sessionUsersList[$row_destination_list['user_id']] = $row_destination_list ; + } + } } } @@ -453,7 +453,7 @@ if(!empty($errorMsg)) { @@ -476,14 +476,14 @@ if(!empty($errorMsg)) {
@@ -511,12 +511,12 @@ if(!empty($errorMsg)) {
-
@@ -573,7 +573,7 @@ function mysort(a, b){ } function valide() { - + var relation_select = document.getElementById('relation'); if (relation_select && relation_select.value=="") { alert(""); diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php index f251d721d6..6c8a6091cd 100755 --- a/main/admin/add_users_to_session.php +++ b/main/admin/add_users_to_session.php @@ -53,7 +53,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){ if (!api_is_platform_admin()) { $sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session; - $rs = Database::query($sql,__FILE__,__LINE__); + $rs = Database::query($sql); if(Database::result($rs,0,0)!=$_user['user_id']) { api_not_allowed(true); } @@ -93,7 +93,7 @@ function search_users($needle,$type) $id_session = Database::escape_string($id_session); // check id_user from session_rel_user table $sql = 'SELECT id_user FROM '.$tbl_session_rel_user.' WHERE id_session ="'.(int)$id_session.'"'; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $user_ids = array(); if (Database::num_rows($res) > 0) { while ($row = Database::fetch_row($res)) { @@ -143,7 +143,7 @@ function search_users($needle,$type) } } - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); $i=0; if ($type=='single') { while ($user = Database :: fetch_array($rs)) { @@ -264,7 +264,7 @@ Display::display_header($tool_name); $nosessionUsersList = $sessionUsersList = array(); /*$sql = 'SELECT COUNT(1) FROM '.$tbl_user; -$rs = Database::query($sql, __FILE__, __LINE__); +$rs = Database::query($sql); $count_courses = Database::result($rs, 0, 0);*/ $ajax_search = $add_type == 'unique' ? true : false; global $_configuration; @@ -292,7 +292,7 @@ if ($ajax_search) { $order_clause"; } } - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $Users=Database::store_result($result); foreach ($Users as $user) { $sessionUsersList[$user['user_id']] = $user ; @@ -373,8 +373,8 @@ if ($ajax_search) { $order_clause"; } } - - $result=Database::query($sql,__FILE__,__LINE__); + + $result=Database::query($sql); $Users=Database::store_result($result); //var_dump($_REQUEST['id_session']); foreach ($Users as $user) { @@ -407,7 +407,7 @@ if ($ajax_search) { $order_clause"; } } - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); $Users=Database::store_result($result); foreach($Users as $key_user_list =>$value_user_list) { diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php index 3fa84a45e9..80b07dc911 100755 --- a/main/admin/calendar.lib.php +++ b/main/admin/calendar.lib.php @@ -425,7 +425,7 @@ function store_new_agenda_item() VALUES ('".$title."','".$content."', '".$start_date."','".$end_date."')"; - $result = Database::query($sql,__FILE__,__LINE__) or die (Database::error()); + $result = Database::query($sql) or die (Database::error()); $last_id=Database::insert_id(); // store in last_tooledit (first the groups, then the users @@ -475,7 +475,7 @@ function store_new_agenda_item() { $sql = "INSERT INTO $t_agenda_repeat (cal_id, cal_type, cal_end)" . " VALUES ($last_id,'$type',$end)"; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); } } } @@ -532,7 +532,7 @@ function get_agenda_item($id) } if(empty($id)){return $item;} $sql = "SELECT * FROM ".$TABLEAGENDA." WHERE id='".$id."'"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); $entry_to_edit = Database::fetch_array($result); $item['title'] = $entry_to_edit["title"]; $item['content'] = $entry_to_edit["content"]; @@ -598,7 +598,7 @@ function save_edit_agenda_item($id,$title,$content,$start_date,$end_date) start_date='".$start_date."', end_date='".$end_date."' WHERE id='".$id."'"; - $result = Database::query($sql,__FILE__,__LINE__) or die (Database::error()); + $result = Database::query($sql) or die (Database::error()); return true; } @@ -615,18 +615,18 @@ function save_edit_agenda_item($id,$title,$content,$start_date,$end_date) function delete_agenda_item($id) { global $_course; - + $t_agenda = Database::get_main_table(TABLE_MAIN_SYSTEM_CALENDAR); - $id = intval($id); + $id = intval($id); $sql = "SELECT * FROM $t_agenda WHERE id = '$id'"; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); if(Database::num_rows($res) > 0) { $sql = "DELETE FROM ".$t_agenda." WHERE id='$id'"; - $result = Database::query($sql,__FILE__,__LINE__) or die (Database::error()); - api_item_property_update($_course,TOOL_CALENDAR_EVENT,$id,'delete',api_get_user_id()); + $result = Database::query($sql) or die (Database::error()); + api_item_property_update($_course,TOOL_CALENDAR_EVENT,$id,'delete',api_get_user_id()); return true; - } + } return false; } /** @@ -709,7 +709,7 @@ function display_agenda_items() if (is_allowed_to_edit() && !api_is_anonymous()) { $sql="SELECT * FROM ".$TABLEAGENDA.' ORDER BY start_date '.$_SESSION['sort']; //echo "
".$sql."
"; - $result=Database::query($sql,__FILE__,__LINE__) or die(Database::error()); + $result=Database::query($sql) or die(Database::error()); $number_items=Database::num_rows($result); } else { $number_items = 0; @@ -975,12 +975,12 @@ function display_one_agenda_item($agenda_id) --------------------------------------------------*/ $sql="SELECT * FROM ".$TABLEAGENDA; - $result=Database::query($sql,__FILE__,__LINE__) or die(Database::error()); + $result=Database::query($sql) or die(Database::error()); $number_items=Database::num_rows($result); $myrow=Database::fetch_array($result); // there should be only one item so no need for a while loop $sql_rep = "SELECT * FROM $TABLEAGENDA WHERE id = $agenda_id"; - $res_rep = Database::query($sql_rep,__FILE__,__LINE__); + $res_rep = Database::query($sql_rep); $repeat = false; $repeat_id = 0; if(Database::num_rows($res_rep)>0) @@ -1151,7 +1151,7 @@ function display_one_agenda_item($agenda_id) */ function show_group_filter_form() { -/** @todo this select missing to implement */ +/** @todo this select missing to implement */ //$group_list=get_course_groups(); echo ""; function show_user_filter_form() { -/** @todo this select missing to implement */ +/** @todo this select missing to implement */ //$user_list=get_course_users(); echo ""; } function show_user_group_filter_form() -{ - /** @todo this select missing to implement */ +{ + /** @todo this select missing to implement */ echo "\n @@ -202,7 +202,7 @@ if (intval($count_users)<50) { $id_session_category = ''; $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY); $sql = 'SELECT id, name FROM '.$tbl_session_category.' ORDER BY name ASC'; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); $Categories = Database::store_result($result); ?> diff --git a/main/admin/session_category_edit.php b/main/admin/session_category_edit.php index 521944eb0a..c3a849a2f0 100755 --- a/main/admin/session_category_edit.php +++ b/main/admin/session_category_edit.php @@ -37,7 +37,7 @@ $tool_name = get_lang('EditSessionCategory'); $interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); $interbreadcrumb[]=array('url' => "session_category_list.php","name" => get_lang('ListSessionCategory')); $sql = "SELECT * FROM $tbl_session_category WHERE id='".$id."' ORDER BY name"; -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); if (!$infos=Database::fetch_array($result)) { header('Location: session_list.php'); exit(); diff --git a/main/admin/session_category_list.php b/main/admin/session_category_list.php index db2f5af9d3..47aa9a724e 100755 --- a/main/admin/session_category_list.php +++ b/main/admin/session_category_list.php @@ -82,10 +82,10 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { FROM $tbl_session_category sc $where "; $order = ($order == 'ASC')? 'DESC': 'ASC'; - $result_rows = Database::query($query_rows,__FILE__,__LINE__); + $result_rows = Database::query($query_rows); $recorset = Database::fetch_array($result_rows); $num = $recorset['total_rows']; - $result = Database::query($query,__FILE__,__LINE__); + $result = Database::query($query); $Sessions = Database::store_result($result); $nbr_results = sizeof($Sessions); $tool_name = get_lang('ListSessionCategory'); @@ -159,7 +159,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { break; } $sql = 'SELECT COUNT(session_category_id) FROM '.$tbl_session.' WHERE session_category_id = '.intval($enreg['id']); - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); list($nb_courses) = Database::fetch_array($rs); ?> diff --git a/main/admin/session_course_edit.php b/main/admin/session_course_edit.php index 4e661eec35..008565ce8b 100755 --- a/main/admin/session_course_edit.php +++ b/main/admin/session_course_edit.php @@ -37,7 +37,7 @@ $interbreadcrumb[]=array('url' => "session_list.php","name" => get_lang("Session $interbreadcrumb[]=array('url' => "../admin/resume_session.php?id_session=".Security::remove_XSS($_REQUEST['id_session']),"name" => get_lang('SessionOverview')); $interbreadcrumb[]=array('url' => "session_course_list.php?id_session=$id_session","name" =>api_htmlentities($session_name,ENT_QUOTES,$charset)); -$result = Database::query("SELECT s.name, c.title FROM $tbl_session_course sc,$tbl_session s,$tbl_course c WHERE sc.id_session=s.id AND sc.course_code=c.code AND sc.id_session='$id_session' AND sc.course_code='".addslashes($course_code)."'",__FILE__,__LINE__); +$result = Database::query("SELECT s.name, c.title FROM $tbl_session_course sc,$tbl_session s,$tbl_course c WHERE sc.id_session=s.id AND sc.course_code=c.code AND sc.id_session='$id_session' AND sc.course_code='".addslashes($course_code)."'"); if (!list($session_name,$course_title)=Database::fetch_row($result)) { header('Location: session_course_list.php?id_session='.$id_session); @@ -50,7 +50,7 @@ if ($_POST['formSent']) { // get all tutor by course_code in the session $sql = "SELECT id_user FROM $tbl_session_rel_course_rel_user WHERE id_session = '$id_session' AND course_code = '$course_code' AND status = 2"; - $rs_coachs = Database::query($sql,__FILE__,__LINE__); + $rs_coachs = Database::query($sql); $coachs_course_session = array(); if (Database::num_rows($rs_coachs) > 0){ @@ -83,7 +83,7 @@ if ($_POST['formSent']) { }else { $sql = "SELECT id_user FROM $tbl_session_rel_course_rel_user WHERE id_session = '$id_session' AND course_code = '$course_code' AND status = 2 "; - $rs = Database::query($sql,__FILE__,__LINE__); + $rs = Database::query($sql); if (Database::num_rows($rs) > 0) { while ($infos = Database::fetch_array($rs)) { @@ -95,7 +95,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; -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); $coaches=Database::store_result($result); diff --git a/main/admin/session_course_list.php b/main/admin/session_course_list.php index cc950453d0..10459a3eb9 100755 --- a/main/admin/session_course_list.php +++ b/main/admin/session_course_list.php @@ -28,7 +28,7 @@ $page=intval($_GET['page']); $action=$_REQUEST['action']; $sort=in_array($_GET['sort'],array('title','nbr_users'))?$_GET['sort']:'title'; -$result=Database::query("SELECT name FROM $tbl_session WHERE id='$id_session'",__FILE__,__LINE__); +$result=Database::query("SELECT name FROM $tbl_session WHERE id='$id_session'"); if(!list($session_name)=Database::fetch_row($result)) { @@ -45,11 +45,11 @@ if($action == 'delete') { } $idChecked = $my_temp; $idChecked="'".implode("','",$idChecked)."'"; - Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)",__FILE__,__LINE__); + Database::query("DELETE FROM $tbl_session_rel_course WHERE id_session='$id_session' AND course_code IN($idChecked)"); $nbr_affected_rows=Database::affected_rows(); - Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code IN($idChecked)",__FILE__,__LINE__); + Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code IN($idChecked)"); - Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'",__FILE__,__LINE__); + Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'"); } header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort); @@ -59,7 +59,7 @@ if($action == 'delete') { $limit=20; $from=$page * $limit; -$result=Database::query("SELECT code,title,nbr_users FROM $tbl_session_rel_course,$tbl_course WHERE course_code=code AND id_session='$id_session' ORDER BY $sort LIMIT $from,".($limit+1),__FILE__,__LINE__); +$result=Database::query("SELECT code,title,nbr_users FROM $tbl_session_rel_course,$tbl_course WHERE course_code=code AND id_session='$id_session' ORDER BY $sort LIMIT $from,".($limit+1)); $Courses=Database::store_result($result); $nbr_results=sizeof($Sessions); $tool_name = api_htmlentities($session_name,ENT_QUOTES,$charset).' : '.get_lang('CourseListInSession'); diff --git a/main/admin/session_course_user.php b/main/admin/session_course_user.php index a9cbd9d357..85e6cb2f66 100755 --- a/main/admin/session_course_user.php +++ b/main/admin/session_course_user.php @@ -47,7 +47,7 @@ if (empty($id_user) || empty($id_session)) { if (!api_is_platform_admin()) { $sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session; - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); if (Database::result($rs,0,0)!=$_user['user_id']) { api_not_allowed(true); } @@ -73,7 +73,7 @@ if ($_POST['formSent']) { ON (srcru.id_session = session_rel_course.id_session) WHERE id_user = $id_user and session_rel_course.id_session = $id_session"; - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); $existingCourses = Database::store_result($rs); if (count($CourseList) == count($existingCourses)) { header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('MaybeYouWantToDeleteThisUserFromSession')); @@ -90,11 +90,11 @@ if ($_POST['formSent']) { $enreg_course = Database::escape_string($enreg_course); $sql_delete = "DELETE FROM $tbl_session_rel_course_rel_user WHERE id_user='".$id_user."' AND course_code='".$enreg_course."' AND id_session=$id_session"; - Database::query($sql_delete,__FILE__, __LINE__); + Database::query($sql_delete); if(Database::affected_rows()) { //update session rel course table $sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users - 1 WHERE id_session='$id_session' AND course_code='$enreg_course'"; - Database::query($sql_update,__FILE__, __LINE__); + Database::query($sql_update); } } } @@ -103,11 +103,11 @@ if ($_POST['formSent']) { if(!in_array($existingCourse['code'], $CourseList)){ $existingCourse = Database::escape_string($existingCourse['code']); $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$existingCourse','$id_user')"; - Database::query($sql_insert,__FILE__, __LINE__); + Database::query($sql_insert); if(Database::affected_rows()) { //update session rel course table $sql_update = "UPDATE $tbl_session_rel_course SET nbr_users= nbr_users + 1 WHERE id_session='$id_session' AND course_code='$existingCourse'"; - Database::query($sql_update,__FILE__, __LINE__); + Database::query($sql_update); } } @@ -170,10 +170,10 @@ if ($_configuration['multiple_access_urls']==true) { } }*/ -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); $Courses=Database::store_result($result); -$result=Database::query($sql_all,__FILE__,__LINE__); +$result=Database::query($sql_all); $CoursesAll=Database::store_result($result); $course_temp = array(); diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php index a464620236..8dd2495847 100755 --- a/main/admin/session_course_user_list.php +++ b/main/admin/session_course_user_list.php @@ -29,7 +29,7 @@ if (is_array($idChecked)) { } $idChecked = $my_temp; } -$result=Database::query("SELECT name,title FROM $tbl_session,$tbl_course WHERE id='$id_session' AND code='".addslashes($course_code)."'",__FILE__,__LINE__); +$result=Database::query("SELECT name,title FROM $tbl_session,$tbl_course WHERE id='$id_session' AND code='".addslashes($course_code)."'"); if(!list($session_name,$course_title)=Database::fetch_row($result)) { @@ -40,9 +40,9 @@ if(!list($session_name,$course_title)=Database::fetch_row($result)) if($action == 'delete') { if(is_array($idChecked) && count($idChecked)>0 ) { $idChecked=implode(',',$idChecked); - Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='".addslashes($course_code)."' AND id_user IN($idChecked)",__FILE__,__LINE__); + Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='".addslashes($course_code)."' AND id_user IN($idChecked)"); $nbr_affected_rows=Database::affected_rows(); - Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE id_session='$id_session' AND course_code='".addslashes($course_code)."'",__FILE__,__LINE__); + Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE id_session='$id_session' AND course_code='".addslashes($course_code)."'"); } header('Location: '.api_get_self().'?id_session='.$id_session.'&course_code='.urlencode($course_code).'&sort='.$sort); exit(); @@ -52,7 +52,7 @@ $limit=20; $from=$page * $limit; $is_western_name_order = api_is_western_name_order(); -$result=Database::query("SELECT user_id,".($is_western_name_order ? 'firstname,lastname' : 'lastname,firstname').",username FROM $tbl_session_rel_course_rel_user,$tbl_user WHERE user_id=id_user AND id_session='$id_session' AND course_code='".addslashes($course_code)."' ORDER BY $sort LIMIT $from,".($limit+1),__FILE__,__LINE__); +$result=Database::query("SELECT user_id,".($is_western_name_order ? 'firstname,lastname' : 'lastname,firstname').",username FROM $tbl_session_rel_course_rel_user,$tbl_user WHERE user_id=id_user AND id_session='$id_session' AND course_code='".addslashes($course_code)."' ORDER BY $sort LIMIT $from,".($limit+1)); $Users=Database::store_result($result); $nbr_results=sizeof($Users); diff --git a/main/admin/session_edit.php b/main/admin/session_edit.php index 1b5a946238..33b6dddce9 100755 --- a/main/admin/session_edit.php +++ b/main/admin/session_edit.php @@ -27,7 +27,7 @@ $tool_name = get_lang('EditSession'); $interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); $interbreadcrumb[]=array('url' => "session_list.php","name" => get_lang('SessionList')); -$result=Database::query("SELECT name,date_start,date_end,id_coach, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility FROM $tbl_session WHERE id='$id'",__FILE__,__LINE__); +$result=Database::query("SELECT name,date_start,date_end,id_coach, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility FROM $tbl_session WHERE id='$id'"); if (!$infos=Database::fetch_array($result)) { header('Location: session_list.php'); @@ -76,7 +76,7 @@ if ($_configuration['multiple_access_urls']==true){ } } -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); $Coaches=Database::store_result($result); $thisYear=date('Y'); @@ -126,7 +126,7 @@ unset($Coaches); $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY); //$access_url_id = api_get_current_access_url_id(); $sql = 'SELECT id, name FROM '.$tbl_session_category.' ORDER BY name ASC'; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); $Categories = Database::store_result($result); ?> diff --git a/main/admin/session_export.php b/main/admin/session_export.php index 27be1c577b..a179269a2d 100755 --- a/main/admin/session_export.php +++ b/main/admin/session_export.php @@ -84,7 +84,7 @@ if ($_POST['formSent'] ) } } - $result=Database::query($sql,__FILE__,__LINE__); + $result=Database::query($sql); } else { @@ -94,7 +94,7 @@ if ($_POST['formSent'] ) ON $tbl_user.user_id = $tbl_session.id_coach WHERE id='$session_id'"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); } @@ -161,7 +161,7 @@ if ($_POST['formSent'] ) ON $tbl_user.user_id = $tbl_session_user.id_user AND $tbl_session_user.id_session = '".$row['id']."'"; - $rsUsers = Database::query($sql,__FILE__,__LINE__); + $rsUsers = Database::query($sql); $users = ''; while($rowUsers = Database::fetch_array($rsUsers)){ if($cvs){ @@ -186,7 +186,7 @@ if ($_POST['formSent'] ) ON $tbl_course.code = $tbl_session_course_user.course_code AND $tbl_session_course_user.id_session = '".$row['id']."'"; - $rsCourses = Database::query($sql,__FILE__,__LINE__); + $rsCourses = Database::query($sql); $courses = ''; while($rowCourses = Database::fetch_array($rsCourses)){ @@ -198,7 +198,7 @@ if ($_POST['formSent'] ) WHERE scu.course_code = '{$rowCourses['code']}' AND scu.id_session = '".$row['id']."' AND scu.status = 2 "; - $rs_coachs = Database::query($sql,__FILE__,__LINE__); + $rs_coachs = Database::query($sql); $coachs = array(); while ($row_coachs = Database::fetch_array($rs_coachs)) { $coachs[] = $row_coachs['username']; @@ -225,7 +225,7 @@ if ($_POST['formSent'] ) AND scu.course_code='".$rowCourses['code']."' AND scu.id_session='".$row['id']."'"; - $rsUsersCourse = Database::query($sql,__FILE__,__LINE__); + $rsUsersCourse = Database::query($sql); $userscourse = ''; while($rowUsersCourse = Database::fetch_array($rsUsersCourse)){ @@ -291,7 +291,7 @@ if ($_configuration['multiple_access_urls']==true) { } -$result=Database::query($sql,__FILE__,__LINE__); +$result=Database::query($sql); $Sessions=Database::store_result($result); ?> diff --git a/main/admin/session_import.php b/main/admin/session_import.php index 75fb18f539..fab3e92009 100755 --- a/main/admin/session_import.php +++ b/main/admin/session_import.php @@ -113,7 +113,7 @@ if ($_POST['formSent']) { status = '".Database::escape_string($status)."'"; // When it is applicable, adding the access_url rel user relationship too. - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); $return = Database::insert_id(); global $_configuration; require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php'; @@ -160,7 +160,7 @@ if ($_POST['formSent']) { status = '".Database::escape_string($status)."' WHERE username = '".Database::escape_string($username)."'"; - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); } } } @@ -176,7 +176,7 @@ if ($_POST['formSent']) { // Looking up for the teacher. $sql = "SELECT user_id, lastname, firstname FROM $tbl_user WHERE username='$username'"; - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); list($user_id, $lastname, $firstname) = Database::fetch_array($rs); global $_configuration; $keys = define_course_keys($course_code, '', $_configuration['db_prefix']); @@ -223,7 +223,7 @@ if ($_POST['formSent']) { tutor_name = '".api_get_person_name($firstname, $lastname, null, null, $language)."', visual_code = '".$current_course_code."'"; - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); $sql = "INSERT INTO ".$tbl_course_user." SET course_code = '".$current_course_id."', @@ -234,7 +234,7 @@ if ($_POST['formSent']) { sort='". ($sort + 1)."', user_course_cat='0'"; - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); } } } @@ -302,7 +302,7 @@ if ($_POST['formSent']) { $suffix = ' - '.$i; } $sql = 'SELECT 1 FROM '.$tbl_session.' WHERE name="'.Database::escape_string($session_name.$suffix).'"'; - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); if (Database::result($rs, 0, 0)) { $i++; } else { @@ -319,7 +319,7 @@ if ($_POST['formSent']) { visibility = '$visibility', session_category_id = '$session_category_id', session_admin_id=".intval($_user['user_id']); - $rs_session = Database::query($sql_session, __FILE__, __LINE__); + $rs_session = Database::query($sql_session); $session_id = Database::insert_id(); $session_counter++; @@ -336,7 +336,7 @@ if ($_POST['formSent']) { visibility = '$visibility', session_category_id = '$session_category_id', session_admin_id=".intval($_user['user_id']); - $rs_session = Database::query($sql_session, __FILE__, __LINE__); + $rs_session = Database::query($sql_session); $session_id = Database::insert_id(); $session_counter++; } else { @@ -348,12 +348,12 @@ if ($_POST['formSent']) { visibility = '$visibility', session_category_id = '$session_category_id' WHERE name = '$session_name'"; - $rs_session = Database::query($sql_session, __FILE__, __LINE__); - $session_id = Database::query("SELECT id FROM $tbl_session WHERE name='$session_name'", __FILE__, __LINE__); + $rs_session = Database::query($sql_session); + $session_id = Database::query("SELECT id FROM $tbl_session WHERE name='$session_name'"); list($session_id) = Database::fetch_array($session_id); - Database::query("DELETE FROM $tbl_session_user WHERE id_session='$session_id'", __FILE__, __LINE__); - Database::query("DELETE FROM $tbl_session_course WHERE id_session='$session_id'", __FILE__, __LINE__); - Database::query("DELETE FROM $tbl_session_course_user WHERE id_session='$session_id'", __FILE__, __LINE__); + Database::query("DELETE FROM $tbl_session_user WHERE id_session='$session_id'"); + Database::query("DELETE FROM $tbl_session_course WHERE id_session='$session_id'"); + Database::query("DELETE FROM $tbl_session_course_user WHERE id_session='$session_id'"); } } @@ -378,7 +378,7 @@ if ($_POST['formSent']) { $sql = "INSERT IGNORE INTO $tbl_session_user SET id_user='$user_id', id_session = '$session_id'"; - $rs_user = Database::query($sql, __FILE__, __LINE__); + $rs_user = Database::query($sql); $user_counter++; } } @@ -400,7 +400,7 @@ if ($_POST['formSent']) { $sql_course = "INSERT INTO $tbl_session_course SET course_code = '$course_code', id_session='$session_id'"; - $rs_course = Database::query($sql_course, __FILE__, __LINE__); + $rs_course = Database::query($sql_course); } $course_coachs = explode(",",$node_course->Coach); @@ -415,7 +415,7 @@ if ($_POST['formSent']) { course_code='$course_code', id_session = '$session_id', status = 2 "; - $rs_coachs = Database::query($sql, __FILE__, __LINE__); + $rs_coachs = Database::query($sql); } else { $error_message .= get_lang('UserDoesNotExist').' : '.$user.'
'; } @@ -432,21 +432,21 @@ if ($_POST['formSent']) { $sql = "INSERT IGNORE INTO $tbl_session_user SET id_user='$user_id', id_session = '$session_id'"; - $rs_user = Database::query($sql, __FILE__, __LINE__); + $rs_user = Database::query($sql); $user_counter++; // Adding to session_rel_user_rel_course table. $sql = "INSERT IGNORE INTO $tbl_session_course_user SET id_user='$user_id', course_code='$course_code', id_session = '$session_id'"; - $rs_users = Database::query($sql, __FILE__, __LINE__); + $rs_users = Database::query($sql); $users_in_course_counter++; } else { $error_message .= get_lang('UserDoesNotExist').' : '.$username.'
'; } } $update_session_course = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='$course_code'"; - Database::query($update_session_course, __FILE__, __LINE__); + Database::query($update_session_course); $inserted_in_course[$course_code] = $course_info['title']; } @@ -463,7 +463,7 @@ if ($_POST['formSent']) { $sql_course = "INSERT INTO $tbl_session_course SET course_code = '".$vcourse['code']."', id_session='$session_id'"; - $rs_course = Database::query($sql_course, __FILE__, __LINE__); + $rs_course = Database::query($sql_course); $course_coachs = explode(",",$node_course->Coach); @@ -477,7 +477,7 @@ if ($_POST['formSent']) { course_code='{$vcourse['code']}', id_session = '$session_id', status = 2 "; - $rs_coachs = Database::query($sql, __FILE__, __LINE__); + $rs_coachs = Database::query($sql); } else { $error_message .= get_lang('UserDoesNotExist').' : '.$user.'
'; } @@ -494,21 +494,21 @@ if ($_POST['formSent']) { $sql = "INSERT IGNORE INTO $tbl_session_user SET id_user='$user_id', id_session = '$session_id'"; - $rs_user = Database::query($sql, __FILE__, __LINE__); + $rs_user = Database::query($sql); $user_counter++; // Adding to session_rel_user_rel_course table. $sql = "INSERT IGNORE INTO $tbl_session_course_user SET id_user='$user_id', course_code='{$vcourse['code']}', id_session = '$session_id'"; - $rs_users = Database::query($sql, __FILE__, __LINE__); + $rs_users = Database::query($sql); $users_in_course_counter++; } else { $error_message .= get_lang('UserDoesNotExist').' : '.$username.'
'; } } $update_session_course = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='$course_code'"; - Database::query($update_session_course, __FILE__, __LINE__); + Database::query($update_session_course); $inserted_in_course[$course_code] = $course_info['title']; } @@ -520,7 +520,7 @@ if ($_POST['formSent']) { $error_message .= get_lang('CourseDoesNotExist').' : '.$course_code.'
'; } } - Database::query("UPDATE $tbl_session SET nbr_users='$user_counter', nbr_courses='$course_counter' WHERE id='$session_id'", __FILE__, __LINE__); + Database::query("UPDATE $tbl_session SET nbr_users='$user_counter', nbr_courses='$course_counter' WHERE id='$session_id'"); } } @@ -592,7 +592,7 @@ if ($_POST['formSent']) { $suffix = ' - '.$i; } $sql = 'SELECT 1 FROM '.$tbl_session.' WHERE name="'.Database::escape_string($session_name.$suffix).'"'; - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); if (Database::result($rs, 0, 0)) { $i++; @@ -611,7 +611,7 @@ if ($_POST['formSent']) { visibility = '$visibility', session_category_id = '$session_category_id', session_admin_id=".intval($_user['user_id']); - $rs_session = Database::query($sql_session, __FILE__, __LINE__); + $rs_session = Database::query($sql_session); $session_id = Database::insert_id(); $session_counter++; } else { @@ -627,7 +627,7 @@ if ($_POST['formSent']) { visibility = '$visibility', session_category_id = '$session_category_id'"; - $rs_session = Database::query($sql_session, __FILE__, __LINE__); + $rs_session = Database::query($sql_session); // We get the last insert id. $my_session_result = SessionManager::get_session_by_name($session_name); $session_id = $my_session_result['id']; @@ -641,12 +641,12 @@ if ($_POST['formSent']) { visibility = '$visibility', session_category_id = '$session_category_id' WHERE name = '$session_name'"; - $rs_session = Database::query($sql_session, __FILE__, __LINE__); - $session_id = Database::query("SELECT id FROM $tbl_session WHERE name='$session_name'", __FILE__, __LINE__); + $rs_session = Database::query($sql_session); + $session_id = Database::query("SELECT id FROM $tbl_session WHERE name='$session_name'"); list($session_id) = Database::fetch_array($session_id); - Database::query("DELETE FROM $tbl_session_user WHERE id_session='$session_id'", __FILE__, __LINE__); - Database::query("DELETE FROM $tbl_session_course WHERE id_session='$session_id'", __FILE__, __LINE__); - Database::query("DELETE FROM $tbl_session_course_user WHERE id_session='$session_id'", __FILE__, __LINE__); + Database::query("DELETE FROM $tbl_session_user WHERE id_session='$session_id'"); + Database::query("DELETE FROM $tbl_session_course WHERE id_session='$session_id'"); + Database::query("DELETE FROM $tbl_session_course_user WHERE id_session='$session_id'"); } $session_counter++; } @@ -662,7 +662,7 @@ if ($_POST['formSent']) { $sql = "INSERT IGNORE INTO $tbl_session_user SET id_user='$user_id', id_session = '$session_id'"; - $rs_user = Database::query($sql, __FILE__, __LINE__); + $rs_user = Database::query($sql); $user_counter++; } } @@ -693,7 +693,7 @@ if ($_POST['formSent']) { $sql_course = "INSERT IGNORE INTO $tbl_session_course SET course_code = '$course_code', id_session='$session_id'"; - $rs_course = Database::query($sql_course, __FILE__, __LINE__); + $rs_course = Database::query($sql_course); $course_counter++; $course_split = array(); @@ -715,7 +715,7 @@ if ($_POST['formSent']) { course_code='$course_code', id_session = '$session_id', status = 2 "; - $rs_coachs = Database::query($sql, __FILE__, __LINE__); + $rs_coachs = Database::query($sql); } else { $error_message .= get_lang('UserDoesNotExist').' : '.$user.'
'; } @@ -730,14 +730,14 @@ if ($_POST['formSent']) { id_user='$user_id', course_code='$course_code', id_session = '$session_id'"; - $rs_users = Database::query($sql, __FILE__, __LINE__); + $rs_users = Database::query($sql); $users_in_course_counter++; } else { $error_message .= get_lang('UserDoesNotExist').' : '.$user.'
'; } } $sql = "UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='$course_code'"; - Database::query($sql,__FILE__,__LINE__); + Database::query($sql); $course_info = CourseManager::get_course_information($course_code); $inserted_in_course[$course_code] = $course_info['title']; @@ -762,7 +762,7 @@ if ($_POST['formSent']) { course_code = '".$vcourse['code']."', id_session='$session_id'"; - $rs_course = Database::query($sql_course, __FILE__, __LINE__); + $rs_course = Database::query($sql_course); // adding coachs to session course user foreach ($course_coachs as $course_coach) { @@ -773,7 +773,7 @@ if ($_POST['formSent']) { course_code='{$vcourse['code']}', id_session = '$session_id', status = 2 "; - $rs_coachs = Database::query($sql, __FILE__, __LINE__); + $rs_coachs = Database::query($sql); } else { $error_message .= get_lang('UserDoesNotExist').' : '.$user.'
'; } @@ -788,13 +788,13 @@ if ($_POST['formSent']) { id_user='$user_id', course_code='{$vcourse['code']}', id_session = '$session_id'"; - $rs_users = Database::query($sql, __FILE__, __LINE__); + $rs_users = Database::query($sql); $users_in_course_counter++; } else { $error_message .= get_lang('UserDoesNotExist').' : '.$user.'
'; } } - Database::query("UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='".$vcourse['code']."'", __FILE__, __LINE__); + Database::query("UPDATE $tbl_session_course SET nbr_users='$users_in_course_counter' WHERE course_code='".$vcourse['code']."'"); } } $inserted_in_course[$vcourse['code']] = $vcourse['title']; @@ -802,7 +802,7 @@ if ($_POST['formSent']) { } $sql_update_users = "UPDATE $tbl_session SET nbr_users='$user_counter', nbr_courses='$course_counter' WHERE id='$session_id'"; - Database::query($sql_update_users, __FILE__, __LINE__); + Database::query($sql_update_users); } } } diff --git a/main/admin/session_list.php b/main/admin/session_list.php index 9f245eafa3..c7db4474b1 100755 --- a/main/admin/session_list.php +++ b/main/admin/session_list.php @@ -51,7 +51,7 @@ $interbreadcrumb[]=array("url" => "index.php","name" => get_lang('PlatformAdmin' //table for the search if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { - + $interbreadcrumb[] = array ("url" => 'session_list.php', "name" => get_lang('SessionList')); $tool_name = get_lang('SearchASession'); Display :: display_header($tool_name); @@ -82,7 +82,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { $limit=20; $from=$page * $limit; $where = 'WHERE 1=1 '; - + //Prevent hacking keyword if ( isset ($_GET['keyword'])) { $keyword = Database::escape_string(trim($_GET['keyword'])); @@ -93,28 +93,28 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { $keyword_firstname = Database::escape_string(trim($_GET['keyword_firstname'])); $keyword_lastname = Database::escape_string(trim($_GET['keyword_lastname'])); } - + //Process for the search advanced if (!empty($_REQUEST['keyword_name'])) { $where .= " AND s.name LIKE '%".$keyword_name."%'"; - } - + } + if (!empty($_REQUEST['keyword_category'])) { $where .= " AND sc.name LIKE '%".$keyword_category."%'"; } - + if (!empty($_REQUEST['keyword_visibility']) AND $_REQUEST['keyword_visibility']!='%') { $where .= " AND s.visibility LIKE '%".$keyword_visibility."%'"; } - + if (!empty($_REQUEST['keyword_firstname'])) { $where .= " AND u.firstname LIKE '%".$keyword_firstname."%'"; } - + if (!empty($_REQUEST['keyword_lastname'])) { $where .= " AND u.lastname LIKE '%".$keyword_lastname."%'"; } - + if (isset($_REQUEST['active']) && isset($_REQUEST['inactive'] )) { // if both are set we search all sessions $cond_url = '&active='.Security::remove_XSS($_REQUEST['active']); @@ -129,56 +129,56 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { $cond_url = '&inactive='.Security::remove_XSS($_REQUEST['inactive']); } } - + if(isset($_GET['id_category'])){ $where.= ' AND '; - $id_category = Security::remove_XSS($id_category); + $id_category = Security::remove_XSS($id_category); $where.= ' session_category_id = "'.$id_category.'" '; - $cond_url.= '&id_category='.$id_category; + $cond_url.= '&id_category='.$id_category; } - + //Get list sessions $sort = ($sort != "name_category")? 's.'.$sort : 'category_name'; $query = "SELECT s.id, s.name, s.nbr_courses, s.date_start, s.date_end, u.firstname, u.lastname , sc.name as category_name, s.visibility - FROM $tbl_session s - LEFT JOIN $tbl_session_category sc ON s.session_category_id = sc.id - INNER JOIN $tbl_user u ON s.id_coach = u.user_id - $where + FROM $tbl_session s + LEFT JOIN $tbl_session_category sc ON s.session_category_id = sc.id + INNER JOIN $tbl_user u ON s.id_coach = u.user_id + $where ORDER BY $sort "; //query which allows me to get a record without taking into account the page - $query_rows = "SELECT count(*) as total_rows - FROM $tbl_session s + $query_rows = "SELECT count(*) as total_rows + FROM $tbl_session s LEFT JOIN $tbl_session_category sc ON s.session_category_id = sc.id - INNER JOIN $tbl_user u ON s.id_coach = u.user_id + INNER JOIN $tbl_user u ON s.id_coach = u.user_id $where "; //filtering the session list by access_url if ($_configuration['multiple_access_urls'] == true){ - $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $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) { $where.= " AND ar.access_url_id = $access_url_id "; $query = "SELECT s.id, s.name, s.nbr_courses, s.date_start, s.date_end, u.firstname, u.lastname , sc.name as category_name , s.visibility - FROM $tbl_session s + FROM $tbl_session s LEFT JOIN $tbl_session_category sc ON s.session_category_id = sc.id - INNER JOIN $tbl_user u ON s.id_coach = u.user_id + INNER JOIN $tbl_user u ON s.id_coach = u.user_id INNER JOIN $table_access_url_rel_session ar ON ar.session_id = s.id - $where + $where ORDER BY $sort LIMIT $from,".($limit+1); - $query_rows = "SELECT count(*) as total_rows - FROM $tbl_session s - LEFT JOIN $tbl_session_category sc ON s.session_category_id = sc.id - INNER JOIN $tbl_user u ON s.id_coach = u.user_id - INNER JOIN $table_access_url_rel_session ar ON ar.session_id = s.id + $query_rows = "SELECT count(*) as total_rows + FROM $tbl_session s + LEFT JOIN $tbl_session_category sc ON s.session_category_id = sc.id + INNER JOIN $tbl_user u ON s.id_coach = u.user_id + INNER JOIN $table_access_url_rel_session ar ON ar.session_id = s.id $where "; } } - $result_rows = Database::query($query_rows,__FILE__,__LINE__); + $result_rows = Database::query($query_rows); $recorset = Database::fetch_array($result_rows); $num = $recorset['total_rows']; - $result=Database::query($query,__FILE__,__LINE__); + $result=Database::query($query); $Sessions=Database::store_result($result); $nbr_results=sizeof($Sessions); $tool_name = get_lang('SessionList'); @@ -196,8 +196,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { - '.Display::return_icon('view_more_stats.gif',get_lang('AddSession')).get_lang('AddSession').' - '.Display::return_icon('view_more_stats.gif',get_lang('AddSessionsInCategories')).get_lang('AddSessionsInCategories').' + '.Display::return_icon('view_more_stats.gif',get_lang('AddSession')).get_lang('AddSession').' + '.Display::return_icon('view_more_stats.gif',get_lang('AddSessionsInCategories')).get_lang('AddSessionsInCategories').'
'; ?> @@ -259,7 +259,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { } $sql = 'SELECT COUNT(course_code) FROM '.$tbl_session_rel_course.' WHERE id_session='.intval($enreg['id']); - $rs = Database::query($sql, __FILE__, __LINE__); + $rs = Database::query($sql); list($nb_courses) = Database::fetch_array($rs); ?> @@ -273,7 +273,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { diff --git a/main/admin/settings.php b/main/admin/settings.php index 6a9bf735cc..dd38667f7b 100755 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -64,7 +64,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' $my_category = Database::escape_string($_GET['category']); $sqlcountsettings = "SELECT COUNT(*) FROM $table_settings_current WHERE category='".$my_category."' AND type<>'checkbox'"; - $resultcountsettings = Database::query($sqlcountsettings, __FILE__, __LINE__); + $resultcountsettings = Database::query($sqlcountsettings); $countsetting = Database::fetch_array($resultcountsettings); if ($_configuration['access_url']==1) { @@ -98,7 +98,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' //print_r($settings_by_access_list);echo ''; //$sqlsettings = "SELECT DISTINCT * FROM $table_settings_current WHERE category='$my_category' GROUP BY variable ORDER BY id ASC"; - //$resultsettings = Database::query($sqlsettings, __FILE__, __LINE__); + //$resultsettings = Database::query($sqlsettings); //while ($row = Database::fetch_array($resultsettings)) $default_values = array(); foreach($settings as $row) { @@ -218,7 +218,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' //1. we collect all the options of this variable $sql = "SELECT * FROM settings_current WHERE variable='".$row['variable']."' AND access_url = 1"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $group = array (); while ($rowkeys = Database::fetch_array($result)) { if ($rowkeys['variable'] == 'course_create_active_tools' && $rowkeys['subkey'] == 'enable_search') {continue;} @@ -234,7 +234,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' $access_url = $_configuration['access_url']; if(empty($access_url )) $access_url =1; $sql = "SELECT selected_value FROM settings_current WHERE variable='".$rowkeys['variable']."' AND subkey='".$rowkeys['subkey']."' AND subkeytext='".$rowkeys['subkeytext']."' AND access_url = $access_url"; - $result_access = Database::query($sql, __FILE__, __LINE__); + $result_access = Database::query($sql); $row_access = Database::fetch_array($result_access); if ($row_access['selected_value'] == 'true' && ! $form->isSubmitted()) { $element->setChecked(true); @@ -277,7 +277,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' // will be set to false. $r = api_set_settings_category($my_category,'false',$_configuration['access_url'],array('checkbox','radio')); //$sql = "UPDATE $table_settings_current SET selected_value='false' WHERE category='$my_category' AND type='checkbox'"; - //$result = Database::query($sql, __FILE__, __LINE__); + //$result = Database::query($sql); // Save the settings $keys = array(); foreach ($values as $key => $value) @@ -285,7 +285,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' if (!is_array($value)) { //$sql = "UPDATE $table_settings_current SET selected_value='".Database::escape_string($value)."' WHERE variable='$key'"; - //$result = Database::query($sql, __FILE__, __LINE__); + //$result = Database::query($sql); if (api_get_setting($key) != $value) $keys[] = $key; @@ -296,7 +296,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' { $sql = "SELECT subkey FROM $table_settings_current WHERE variable = '$key'"; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $subkeys = array(); while ($row_subkeys = Database::fetch_array($res)) { // if subkey is changed @@ -311,7 +311,7 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', ' { //$sql = "UPDATE $table_settings_current SET selected_value='true' WHERE variable='$key' AND subkey = '$subkey'"; - //$result = Database::query($sql, __FILE__, __LINE__); + //$result = Database::query($sql); $result = api_set_setting($key,'true',$subkey,null,$_configuration['access_url']); @@ -366,7 +366,7 @@ $action_images['editor'] = 'html.png'; // grabbing the categories //$selectcategories = "SELECT DISTINCT category FROM ".$table_settings_current." WHERE category NOT IN ('stylesheets','Plugins')"; -//$resultcategories = Database::query($selectcategories, __FILE__, __LINE__); +//$resultcategories = Database::query($selectcategories); $resultcategories = api_get_settings_categories(array('stylesheets','Plugins', 'Templates', 'Search')); echo "\n
"; //while ($row = Database::fetch_array($resultcategories)) @@ -426,7 +426,7 @@ function get_settings_options($var) { $table_settings_options = Database :: get_main_table(TABLE_MAIN_SETTINGS_OPTIONS); $sql = "SELECT * FROM $table_settings_options WHERE variable='$var'"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); while ($row = Database::fetch_array($result)) { $temp_array = array ('value' => $row['value'], 'display_text' => $row['display_text']); @@ -763,7 +763,7 @@ function store_plugins() // Step 1 : we remove all the plugins //$sql = "DELETE FROM $table_settings_current WHERE category='Plugins'"; - //Database::query($sql, __LINE__, __FILE__); + //Database::query($sql); $r = api_delete_category_settings('Plugins',$_configuration['access_url']); // step 2: looping through all the post values we only store these which are really a valid plugin location. @@ -773,7 +773,7 @@ function store_plugins() if (is_valid_plugin_location($form_name_elements[1])) { //$sql = "INSERT into $table_settings_current (variable,category,selected_value) VALUES ('".$form_name_elements['1']."','Plugins','".$form_name_elements['0']."')"; - //Database::query($sql, __LINE__, __FILE__); + //Database::query($sql); api_add_setting($form_name_elements['0'],$form_name_elements['1'],$form_name_elements['0'],null,'Plugins',$form_name_elements['0'],null,null,null,$_configuration['access_url'],1); } } @@ -817,7 +817,7 @@ function store_stylesheets() WHERE variable = "stylesheets" AND category = "stylesheets"'; - Database::query($sql, __LINE__, __FILE__); + Database::query($sql); */ api_set_setting('stylesheets',$style,null,'stylesheets',$_configuration['access_url']); @@ -985,7 +985,7 @@ function get_number_of_templates() // The sql statement $sql = "SELECT COUNT(id) AS total FROM $table_system_template"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $row = Database::fetch_array($result); // returning the number of templates @@ -1014,7 +1014,7 @@ function get_template_data($from, $number_of_items, $column, $direction) $sql = "SELECT image as col0, title as col1, id as col2 FROM $table_system_template"; $sql .= " ORDER BY col$column $direction "; $sql .= " LIMIT $from,$number_of_items"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); while ($row = Database::fetch_array($result)) { $row['1'] = get_lang($row['1']); $return[] = $row; @@ -1101,7 +1101,7 @@ function add_edit_template() // Database table definition $table_system_template = Database :: get_main_table('system_template'); $sql = "SELECT * FROM $table_system_template WHERE id = '".Database::escape_string($_GET['id'])."'"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $row = Database::fetch_array($result); $defaults['template_id'] = intval($_GET['id']); @@ -1196,7 +1196,7 @@ function add_edit_template() if ($_GET['action'] == 'add') { $content_template = '{CSS}'.Database::escape_string($values['template_text']).''; $sql = "INSERT INTO $table_system_template (title, content, image) VALUES ('".Database::escape_string($values['title'])."','".$content_template."','".Database::escape_string($new_file_name)."')"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); // display a feedback message Display::display_confirmation_message(get_lang('TemplateAdded')); @@ -1210,7 +1210,7 @@ function add_edit_template() $sql .= ", image = '".Database::escape_string($new_file_name)."'"; } $sql .= " WHERE id='".Database::escape_string($_GET['id'])."'"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); // display a feedback message Display::display_confirmation_message(get_lang('TemplateEdited')); @@ -1244,7 +1244,7 @@ function delete_template($id) // first we remove the image $table_system_template = Database :: get_main_table('system_template'); $sql = "SELECT * FROM $table_system_template WHERE id = '".Database::escape_string($id)."'"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $row = Database::fetch_array($result); if (!empty($row['image'])) { @@ -1253,7 +1253,7 @@ function delete_template($id) // now we remove it from the database $sql = "DELETE FROM $table_system_template WHERE id = '".Database::escape_string($id)."'"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); // display a feedback message Display::display_confirmation_message(get_lang('TemplateDeleted')); diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php index a42a4e4615..e3a9d3593b 100755 --- a/main/admin/special_exports.php +++ b/main/admin/special_exports.php @@ -59,7 +59,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i $to_group_id = 0; $code_course = ''; $sql_session = "SELECT id, name FROM $tbl_session "; - $query_session = Database::query($sql_session, __FILE__, __LINE__); + $query_session = Database::query($sql_session); $ListSession = array(); while ($rows_session = Database::fetch_assoc($query_session)) { $ListSession[$rows_session['id']] = $rows_session['name']; @@ -82,7 +82,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i AND `docs`.`session_id` = '0' AND `props`.`visibility`<>'2' AND `props`.`to_group_id`=".$to_group_id.""; - $query = Database::query($sql ,__FILE__,__LINE__); + $query = Database::query($sql ); while ($rows_course_file = Database::fetch_assoc($query)) { $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'], PCLZIP_OPT_ADD_PATH, $_course['directory'], @@ -100,7 +100,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i AND `docs`.`session_id` = '$session_id' AND `props`.`visibility`<>'2' AND `props`.`to_group_id`=".$to_group_id.""; - $query_session_doc = Database::query($sql_session_doc, __FILE__, __LINE__); + $query_session_doc = Database::query($sql_session_doc); while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) { $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'], PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$ListSession[$session_id], @@ -194,7 +194,7 @@ function fullexportspecial(){ AND `docs`.`session_id` = '0' AND `props`.`visibility`<>'2' AND `props`.`to_group_id`=".$to_group_id.""; - $query = Database::query($sql ,__FILE__,__LINE__); + $query = Database::query($sql ); while ($rows_course_file = Database::fetch_assoc($query)) { $rows_course_file['path']; $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'], @@ -207,7 +207,7 @@ function fullexportspecial(){ $sql_session = "SELECT id, name, course_code FROM $tbl_session_course INNER JOIN $tbl_session ON id_session = id WHERE course_code = '$code_course' "; - $query_session = Database::query($sql_session, __FILE__, __LINE__); + $query_session = Database::query($sql_session); while ($rows_session = Database::fetch_assoc($query_session)) { $session_id = $rows_session['id']; $sql_session_doc = "SELECT path FROM $tbl_document AS docs,$tbl_property AS props @@ -218,7 +218,7 @@ function fullexportspecial(){ AND `docs`.`session_id` = '$session_id' AND `props`.`visibility`<>'2' AND `props`.`to_group_id`=".$to_group_id.""; - $query_session_doc = Database::query($sql_session_doc, __FILE__, __LINE__); + $query_session_doc = Database::query($sql_session_doc); while ($rows_course_session_file = Database::fetch_assoc($query_session_doc)) { $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory'].'/document'.$rows_course_session_file['path'], PCLZIP_OPT_ADD_PATH, $_course['directory']."/".$rows_session['name'], diff --git a/main/admin/statistics/statistics.lib.php b/main/admin/statistics/statistics.lib.php index 6ee159a8c1..1a3a5dde74 100755 --- a/main/admin/statistics/statistics.lib.php +++ b/main/admin/statistics/statistics.lib.php @@ -34,7 +34,7 @@ class Statistics { $sql .= " WHERE category_code = '".Database::escape_string($category_code)."'"; } - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $obj = Database::fetch_object($res); return $obj->number; } @@ -57,7 +57,7 @@ class Statistics { $sql = "SELECT COUNT(DISTINCT(cu.user_id)) AS number FROM $course_user_table cu, $course_table c WHERE cu.status = ".intval(Database::escape_string($status))." AND c.code = cu.course_code AND c.category_code = '".Database::escape_string($category_code)."'"; } - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $obj = Database::fetch_object($res); return $obj->number; } @@ -78,7 +78,7 @@ class Statistics $sql .= " AND (user.username LIKE '%".$keyword."%' OR default_event_type LIKE '%".$keyword."%' OR default_value_type LIKE '%".$keyword."%' OR default_value LIKE '%".$keyword."%') "; } - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $obj = Database::fetch_object($res); return $obj->total_number_of_items; } @@ -113,7 +113,7 @@ class Statistics } $sql .= " LIMIT $from,$number_of_items "; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $activities = array (); while ($row = Database::fetch_row($res)) { $row[4] = api_format_date(DATE_TIME_FORMAT_LONG, strtotime($row[4])); @@ -130,7 +130,7 @@ class Statistics { $category_table = Database :: get_main_table(TABLE_MAIN_CATEGORY); $sql = "SELECT * FROM $category_table ORDER BY tree_pos"; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $categories = array (); while ($category = Database::fetch_object($res)) { @@ -244,7 +244,7 @@ class Statistics $sql = "SELECT DATE_FORMAT( login_date, '%w' ) AS stat_date , count( login_id ) AS number_of_logins FROM ".$table." GROUP BY stat_date ORDER BY DATE_FORMAT( login_date, '%w' ) "; break; } - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $result = array(); while($obj = Database::fetch_object($res)) { @@ -277,7 +277,7 @@ class Statistics $sql[get_lang('Total')] = "SELECT count(login_user_id) AS number FROM $table"; foreach($sql as $index => $query) { - $res = Database::query($query,__FILE__,__LINE__); + $res = Database::query($query); $obj = Database::fetch_object($res); $total_logins[$index] = $obj->number; } @@ -295,7 +295,7 @@ class Statistics $tool_names[$tool] = get_lang(ucfirst($tool), ''); } $sql = "SELECT access_tool, count( access_id ) AS number_of_logins FROM $table WHERE access_tool IN ('".implode("','",$tools)."') GROUP BY access_tool "; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $result = array(); while($obj = Database::fetch_object($res)) { @@ -310,7 +310,7 @@ class Statistics { $table = Database::get_main_table(TABLE_MAIN_COURSE); $sql = "SELECT course_language, count( code ) AS number_of_courses FROM $table GROUP BY course_language "; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $result = array(); while($obj = Database::fetch_object($res)) { @@ -325,10 +325,10 @@ class Statistics { $user_table = Database :: get_main_table(TABLE_MAIN_USER); $sql = "SELECT COUNT(*) AS n FROM $user_table"; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $count1 = Database::fetch_object($res); $sql = "SELECT COUNT(*) AS n FROM $user_table WHERE LENGTH(picture_uri) > 0"; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $count2 = Database::fetch_object($res); $result[get_lang('No')] = $count1->n - $count2->n; // #users without picture $result[get_lang('Yes')] = $count2->n; // #users with picture @@ -405,13 +405,13 @@ class Statistics $date_diff = $values['date_diff']; $table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); $sql = "SELECT * FROM $table GROUP BY access_cours_code HAVING access_cours_code <> '' AND DATEDIFF( NOW() , access_date ) <= ". $date_diff; - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); $number_of_courses = Database::num_rows($res); $sql .= ' ORDER BY '.$columns[$column].' '.$sql_order[$direction]; $from = ($page_nr -1) * $per_page; $sql .= ' LIMIT '.$from.','.$per_page; echo '

'.get_lang('LastAccess').' >= '.$date_diff.' '.get_lang('Days').'

'; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); if (Database::num_rows($res) > 0) { $courses = array (); @@ -434,7 +434,7 @@ class Statistics echo get_lang('NoSearchResults'); } } - + /** * Displays the statistics of the messages sent and received by each user in the social network * @param string Type of message sent or received @@ -454,7 +454,7 @@ class Statistics $sql = "SELECT lastname, firstname, username, COUNT($field) AS count_message FROM ".$message_table." m LEFT JOIN ".$user_table." u ON m.$field = u.user_id GROUP BY m.$field"; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $messages_sent = array(); while ($messages = Database::fetch_array($res)) { $users = $messages['firstname'].' '.$messages['lastname'].' ('.$messages['username'].')'; @@ -462,7 +462,7 @@ class Statistics } return $messages_sent; } - + /** * Count the number of friends for social network users */ @@ -472,7 +472,7 @@ class Statistics $sql = "SELECT lastname, firstname, username, COUNT(friend_user_id) AS count_friend FROM ".$user_friend_table." uf LEFT JOIN ".$user_table." u ON uf.user_id = u.user_id GROUP BY uf.user_id"; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $list_friends = array(); while ($friends = Database::fetch_array($res)) { $users = $friends['firstname'].' '.$friends['lastname'].' ('.$friends['username'].')'; diff --git a/main/admin/sub_language.class.php b/main/admin/sub_language.class.php index 5813c6a8cf..160eeed037 100755 --- a/main/admin/sub_language.class.php +++ b/main/admin/sub_language.class.php @@ -52,7 +52,7 @@ class SubLanguageManager { public static function get_all_information_of_sub_language ($parent_id,$sub_language_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='SELECT * FROM '.$tbl_admin_languages.' WHERE parent_id="'.Database::escape_string($parent_id).'" AND id="'.Database::escape_string($sub_language_id).'"'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); $all_information=array(); while ($row=Database::fetch_array($rs,'ASSOC')) { $all_information=$row; @@ -67,7 +67,7 @@ class SubLanguageManager { public static function get_all_information_of_language ($parent_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='SELECT * FROM '.$tbl_admin_languages.' WHERE id="'.Database::escape_string($parent_id).'"'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); $all_information=array(); while ($row=Database::fetch_array($rs,'ASSOC')) { $all_information=$row; @@ -130,7 +130,7 @@ class SubLanguageManager { public static function removed_sub_language ($parent_id,$sub_language_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql = 'DELETE FROM '.$tbl_admin_languages.' WHERE parent_id="'.Database::escape_string($parent_id).'" AND id="'.Database::escape_string($sub_language_id).'" '; - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); } /** * check if language exist by id @@ -140,7 +140,7 @@ class SubLanguageManager { public static function check_if_exist_language_by_id ($language_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='SELECT count(*) as count FROM '.$tbl_admin_languages.' WHERE id="'.Database::escape_string($language_id).'"'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); if (Database::num_rows($rs)>0) { if (Database::result($rs,0,'count') ==1) { return true; @@ -160,7 +160,7 @@ class SubLanguageManager { public static function get_name_of_language_by_id ($language_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='SELECT original_name FROM '.$tbl_admin_languages.' WHERE id="'.Database::escape_string($language_id).'"'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); if (Database::num_rows($rs)>0) { return Database::result($rs,0,'original_name'); } else { @@ -176,7 +176,7 @@ class SubLanguageManager { public static function check_if_language_is_sub_language ($language_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='SELECT count(*) AS count FROM '.$tbl_admin_languages.' WHERE id="'.Database::escape_string($language_id).'" AND NOT ISNULL(parent_id)'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); if (Database::num_rows($rs)>0 && Database::result($rs,'0','count')==1) { return true; @@ -192,7 +192,7 @@ class SubLanguageManager { public static function check_if_language_is_father ($language_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='SELECT count(*) AS count FROM '.$tbl_admin_languages.' WHERE parent_id="'.Database::escape_string($language_id).'" AND NOT ISNULL(parent_id);'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); if (Database::num_rows($rs)>0 && Database::result($rs,'0','count')==1) { return true; @@ -208,7 +208,7 @@ class SubLanguageManager { public static function make_unavailable_language ($language_id) { $tbl_admin_languages= Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql_make_unavailable = "UPDATE $tbl_admin_languages SET available='0' WHERE id='".Database::escape_string($language_id)."'"; - $result = Database::query($sql_make_unavailable,__FILE__,__LINE__); + $result = Database::query($sql_make_unavailable); } /** * Make available the language @@ -218,7 +218,7 @@ class SubLanguageManager { public static function make_available_language ($language_id) { $tbl_admin_languages= Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql_make_available = "UPDATE $tbl_admin_languages SET available='1' WHERE id='".Database::escape_string($language_id)."'"; - $result = Database::query($sql_make_available,__FILE__,__LINE__); + $result = Database::query($sql_make_available); } /** * Set platform language @@ -229,7 +229,7 @@ class SubLanguageManager { $tbl_admin_languages= Database :: get_main_table(TABLE_MAIN_LANGUAGE); $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); $sql_update = "SELECT english_name FROM ". $tbl_admin_languages." WHERE id='".Database::escape_string($language_id)."'"; - $result = Database::query($sql_update,__FILE__,__LINE__); + $result = Database::query($sql_update); $lang=Database::fetch_array($result); $sql_update_2 = "UPDATE ".$tbl_settings_current." SET selected_value='".$lang['english_name']."' WHERE variable='platformLanguage'"; $result_2 = Database::query($sql_update_2); diff --git a/main/admin/sub_language_add.php b/main/admin/sub_language_add.php index ffc0fcecd9..a361c51cbc 100755 --- a/main/admin/sub_language_add.php +++ b/main/admin/sub_language_add.php @@ -36,7 +36,7 @@ require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; function add_sub_language ($original_name,$english_name,$isocode,$sublanguage_available,$parent_id) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); $sql='INSERT INTO '.$tbl_admin_languages.'(original_name,english_name,isocode,dokeos_folder,available,parent_id) VALUES ("'.api_htmlentities($original_name).'","'.$english_name.'","'.$isocode.'","'.$english_name.'","'.$sublanguage_available.'","'.$parent_id.'")'; - Database::query($sql,__FILE__,__LINE__); + Database::query($sql); } /** * check if language exists @@ -46,9 +46,9 @@ function check_if_language_exist ($original_name,$english_name,$isocode,$sublang $sql_original_name='SELECT count(*) AS count_original_name FROM '.$tbl_admin_languages.' WHERE original_name="'.Database::escape_string(api_htmlentities($original_name)).'" '; $sql_english_name='SELECT count(*) AS count_english_name FROM '.$tbl_admin_languages.' WHERE english_name="'.Database::escape_string($english_name).'" '; $sql_isocode='SELECT count(*) AS count_isocode FROM '.$tbl_admin_languages.' WHERE isocode="'.Database::escape_string($isocode).'" '; - $rs_original_name=Database::query($sql_original_name,__FILE__,__LINE__); - $rs_english_name=Database::query($sql_english_name,__FILE__,__LINE__); - $rs_isocode=Database::query($sql_isocode,__FILE__,__LINE__); + $rs_original_name=Database::query($sql_original_name); + $rs_english_name=Database::query($sql_english_name); + $rs_isocode=Database::query($sql_isocode); $count_original_name=Database::result($rs_original_name,0,'count_original_name'); $count_english_name=Database::result($rs_english_name,0,'count_english_name'); $count_isocode=Database::result($rs_isocode,0,'count_isocode'); @@ -94,7 +94,7 @@ function check_if_exist_language_by_id ($language_id) { */ function ckeck_if_is_parent_of_sub_language ($parent_id) { $sql='SELECT count(*) AS count FROM language WHERE parent_id="'.Database::escape_string($parent_id).'"'; - $rs=Database::query($sql,__FILE__,__LINE__); + $rs=Database::query($sql); if (Database::num_rows($rs)>0 && Database::result($rs,0,'count')==1) { return true; } else { diff --git a/main/admin/subscribe_class2course.php b/main/admin/subscribe_class2course.php index 7dd5cea4d5..77a60b92e0 100755 --- a/main/admin/subscribe_class2course.php +++ b/main/admin/subscribe_class2course.php @@ -99,10 +99,10 @@ if ($_POST['formSent']) } $sql = "SELECT id,name FROM $tbl_class WHERE name LIKE '".$first_letter_class."%' ORDER BY ". (count($classes) > 0 ? "(id IN('".implode("','", $classes)."')) DESC," : "")." name"; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_classes = Database::store_result($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"; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_courses = Database::store_result($result); if (!empty ($error_message)) { diff --git a/main/admin/subscribe_user2class.php b/main/admin/subscribe_user2class.php index 5dea3a9d3d..d435aef5bb 100755 --- a/main/admin/subscribe_user2class.php +++ b/main/admin/subscribe_user2class.php @@ -53,7 +53,7 @@ $tbl_class_user = Database :: get_main_table(TABLE_MAIN_CLASS_USER); $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); $sql = "SELECT name FROM $tbl_class WHERE id='$class_id'"; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); if (!list ($class_name) = Database::fetch_row($result)) { @@ -115,10 +115,10 @@ Display :: display_header($tool_name); //api_display_tool_title($tool_name); $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname'; $sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u LEFT JOIN $tbl_class_user cu ON u.user_id=cu.user_id AND class_id='$class_id' WHERE ".$target_name." LIKE '".$first_letter_left."%' AND class_id IS NULL ORDER BY ". (count($left_user_list) > 0 ? "(user_id IN(".implode(',', $left_user_list).")) DESC," : "")." ".$target_name; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $left_users = Database::store_result($result); $sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u,$tbl_class_user cu WHERE cu.user_id=u.user_id AND class_id='$class_id' AND ".$target_name." LIKE '".$first_letter_right."%' ORDER BY ". (count($right_user_list) > 0 ? "(user_id IN(".implode(',', $right_user_list).")) DESC," : "")." ".$target_name; -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $right_users = Database::store_result($result); if (!empty ($error_message)) { diff --git a/main/admin/subscribe_user2course.php b/main/admin/subscribe_user2course.php index 0a2bc65e4e..08da710237 100755 --- a/main/admin/subscribe_user2course.php +++ b/main/admin/subscribe_user2course.php @@ -162,7 +162,7 @@ if ($_POST['form_sent']) { */ if(empty($first_letter_user)) { $sql = "SELECT count(*) as nb_users FROM $tbl_user"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); $num_row = Database::fetch_array($result); if($num_row['nb_users']>1000) {//if there are too much users to gracefully handle with the HTML select list, @@ -238,7 +238,7 @@ if ($_configuration['multiple_access_urls']==true) { } } -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_users = Database::store_result($result); unset($result); @@ -256,7 +256,7 @@ if ($_configuration['multiple_access_urls']==true) { } } -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); $db_courses = Database::store_result($result); unset($result); diff --git a/main/admin/user_add.php b/main/admin/user_add.php index bbd830cf07..50b43980dd 100755 --- a/main/admin/user_add.php +++ b/main/admin/user_add.php @@ -358,7 +358,7 @@ if( $form->validate()) { if ($platform_admin) { $sql = "INSERT INTO $table_admin SET user_id = '".$user_id."'"; - Database::query($sql,__FILE__,__LINE__); + Database::query($sql); } if (!empty($email) && $send_mail) { $recipient_name = api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS); @@ -369,7 +369,7 @@ if( $form->validate()) { if ($_configuration['multiple_access_urls'] == true) { $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); $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ". $url['url'] ."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator'); } diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php index d4bff15e53..3b1e4cef1f 100755 --- a/main/admin/user_edit.php +++ b/main/admin/user_edit.php @@ -72,7 +72,7 @@ $interbreadcrumb[] = array('url' => "user_list.php","name" => get_lang('UserList $table_user = Database::get_main_table(TABLE_MAIN_USER); $table_admin = Database::get_main_table(TABLE_MAIN_ADMIN); $sql = "SELECT u.*, a.user_id AS is_admin FROM $table_user u LEFT JOIN $table_admin a ON a.user_id = u.user_id WHERE u.user_id = '".$user_id."'"; -$res = Database::query($sql, __FILE__, __LINE__); +$res = Database::query($sql); if (Database::num_rows($res) != 1) { header('Location: user_list.php'); exit; @@ -359,10 +359,10 @@ if ( $form->validate()) { if ($user_id != $_SESSION['_uid']) { if ($platform_admin == 1) { $sql = "INSERT IGNORE INTO $table_admin SET user_id = '".$user_id."'"; - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); } else { $sql = "DELETE FROM $table_admin WHERE user_id = '".$user_id."'"; - Database::query($sql, __FILE__, __LINE__); + Database::query($sql); } } diff --git a/main/admin/user_export.php b/main/admin/user_export.php index 54d4b91407..be53c6d538 100755 --- a/main/admin/user_export.php +++ b/main/admin/user_export.php @@ -67,7 +67,7 @@ if ($_configuration['multiple_access_urls']==true) { ORDER BY visual_code"; } } -$result = Database::query($sql, __FILE__, __LINE__); +$result = Database::query($sql); while ($course = Database::fetch_object($result)) { $courses[$course->code] = $course->visual_code.' - '.$course->title; @@ -134,7 +134,7 @@ if ($form->validate()) } } - $res = Database::query($sql,__FILE__,__LINE__); + $res = Database::query($sql); while($user = Database::fetch_array($res,'ASSOC')) { $student_data= UserManager :: get_extra_user_data($user['UserId'],true,false); foreach($student_data as $key=>$value) { diff --git a/main/admin/user_fields.php b/main/admin/user_fields.php index 6644925600..e32d74e1e6 100755 --- a/main/admin/user_fields.php +++ b/main/admin/user_fields.php @@ -319,7 +319,7 @@ function move_user_field($direction,$field_id) $found = false; $sql = "SELECT id, field_order FROM $table_user_field ORDER BY field_order $sortdirection"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); while($row = Database::fetch_array($result)) { if ($found) @@ -339,8 +339,8 @@ function move_user_field($direction,$field_id) $sql1 = "UPDATE ".$table_user_field." SET field_order = '".Database::escape_string($next_order)."' WHERE id = '".Database::escape_string($this_id)."'"; $sql2 = "UPDATE ".$table_user_field." SET field_order = '".Database::escape_string($this_order)."' WHERE id = '".Database::escape_string($next_id)."'"; - Database::query($sql1,__FILE__,__LINE__); - Database::query($sql2,__FILE__,__LINE__); + Database::query($sql1); + Database::query($sql2); return true; } @@ -364,26 +364,26 @@ function delete_user_fields($field_id) // delete the fields $sql = "DELETE FROM $table_user_field WHERE id = '".Database::escape_string($field_id)."'"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); if (Database::affected_rows() == 1) { // delete the field options $sql = "DELETE FROM $table_user_field_options WHERE field_id = '".Database::escape_string($field_id)."'"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); // delete the field values $sql = "DELETE FROM $table_user_field_values WHERE field_id = '".Database::escape_string($field_id)."'"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); // recalculate the field_order because the value is used to show/hide the up/down icon // and the field_order value cannot be bigger than the number of fields $sql = "SELECT * FROM $table_user_field ORDER BY field_order ASC"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); $i = 1; while($row = Database::fetch_array($result)) { $sql_reorder = "UPDATE $table_user_field SET field_order = '".Database::escape_string($i)."' WHERE id = '".Database::escape_string($row['id'])."'"; - $result_reorder = Database::query($sql_reorder,__FILE__,__LINE__); + $result_reorder = Database::query($sql_reorder); $i++; } diff --git a/main/admin/user_fields_options.php b/main/admin/user_fields_options.php index 2014dac3e3..6d202c36c8 100755 --- a/main/admin/user_fields_options.php +++ b/main/admin/user_fields_options.php @@ -132,7 +132,7 @@ function get_options_data($from, $number_of_items, $column, $direction) id AS col2 FROM $table_userfields_options WHERE field_id='".Database::escape_string($_GET['field_id'])."' ORDER BY option_order ASC"; $sql .= " LIMIT $from,$number_of_items"; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $return = array (); while ($option = Database::fetch_row($res)) { @@ -148,7 +148,7 @@ function get_number_of_options($from=null, $number_of_items=null, $column=null, // The sql statement $sql = "SELECT count(id) as total FROM $table_userfields_options WHERE field_id='".Database::escape_string($_GET['field_id'])."' "; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $row = Database::fetch_row($res); return $row[0]; } @@ -208,7 +208,7 @@ function move_user_field_option($direction,$option_id) $found = false; $sql = "SELECT id, option_order FROM $table_userfields_options WHERE field_id='".Database::escape_string($_GET['field_id'])."' ORDER BY option_order $sortdirection"; - $result = Database::query($sql,__FILE__,__LINE__); + $result = Database::query($sql); while($row = Database::fetch_array($result)) { if ($found) @@ -228,8 +228,8 @@ function move_user_field_option($direction,$option_id) $sql1 = "UPDATE ".$table_userfields_options." SET option_order = '".Database::escape_string($next_order)."' WHERE id = '".Database::escape_string($this_id)."'"; $sql2 = "UPDATE ".$table_userfields_options." SET option_order = '".Database::escape_string($this_order)."' WHERE id = '".Database::escape_string($next_id)."'"; - Database::query($sql1,__FILE__,__LINE__); - Database::query($sql2,__FILE__,__LINE__); + Database::query($sql1); + Database::query($sql2); return true; } diff --git a/main/admin/user_information.php b/main/admin/user_information.php index 8f3f20a226..0aa87f28e0 100755 --- a/main/admin/user_information.php +++ b/main/admin/user_information.php @@ -113,7 +113,7 @@ $result=Database::query("SELECT DISTINCT id, name, date_start, date_end FROM session_rel_user, session WHERE id_session=id AND id_user=$user_id AND (date_start <= NOW() AND date_end >= NOW() OR date_start='0000-00-00') - ORDER BY date_start, date_end, name",__FILE__,__LINE__); + ORDER BY date_start, date_end, name"); $sessions=Database::store_result($result); @@ -123,7 +123,7 @@ $result=Database::query("SELECT DISTINCT id, name, date_start, date_end INNER JOIN $tbl_session_course as session_rel_course ON session_rel_course.id_coach = $user_id AND (date_start <= NOW() AND date_end >= NOW() OR date_start='0000-00-00') - ORDER BY date_start, date_end, name",__FILE__,__LINE__); + ORDER BY date_start, date_end, name"); $session_is_coach = Database::store_result($result); @@ -157,16 +157,16 @@ if(count($sessions)>0){ WHERE session_course.id_session = $id_session ORDER BY i"; */ - // this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not + // this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not $personal_course_list_sql = "SELECT distinct course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, IF(session_course_user.id_user = 3,'2', '5') FROM $tbl_session_course_user as session_course_user INNER JOIN $tbl_course AS course - ON course.code = session_course_user.course_code AND session_course_user.id_session = $id_session + ON course.code = session_course_user.course_code AND session_course_user.id_session = $id_session INNER JOIN $tbl_session as session ON session_course_user.id_session = session.id INNER JOIN $tbl_session_course as session_course LEFT JOIN $tbl_user as user ON user.user_id = session_course_user.id_user AND session_course_user.status = 2 WHERE session_course_user.id_user = $user_id ORDER BY i"; - $course_list_sql_result = Database::query($personal_course_list_sql, __FILE__, __LINE__); + $course_list_sql_result = Database::query($personal_course_list_sql); while ($result_row = Database::fetch_array($course_list_sql_result)){ $key = $result_row['id_session'].' - '.$result_row['k']; @@ -187,7 +187,7 @@ if(count($sessions)>0){ $tools = ''.Display::return_icon('synthese_view.gif', get_lang('Overview')).''. ''.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'' . ''.Display::return_icon('edit.gif', get_lang('Edit')).''; - + if( $my_course->status == STUDENT ){ $tools .= ''.Display::return_icon('delete.gif', get_lang('Delete')).''; @@ -214,7 +214,7 @@ echo ''; * Show the courses in which this user is subscribed */ $sql = 'SELECT * FROM '.$table_course_user.' cu, '.$table_course.' c WHERE cu.user_id = '.$user['user_id'].' AND cu.course_code = c.code'; -$res = Database::query($sql,__FILE__,__LINE__); +$res = Database::query($sql); if (Database::num_rows($res) > 0) { $header=array(); @@ -256,7 +256,7 @@ else $table_class_user = Database :: get_main_table(TABLE_MAIN_CLASS_USER); $table_class = Database :: get_main_table(TABLE_MAIN_CLASS); $sql = 'SELECT * FROM '.$table_class_user.' cu, '.$table_class.' c WHERE cu.user_id = '.$user['user_id'].' AND cu.class_id = c.id'; -$res = Database::query($sql,__FILE__,__LINE__); +$res = Database::query($sql); if (Database::num_rows($res) > 0) { $header = array(); diff --git a/main/admin/user_list.php b/main/admin/user_list.php index dc1b517c20..34c9a2e975 100755 --- a/main/admin/user_list.php +++ b/main/admin/user_list.php @@ -162,7 +162,7 @@ function login_user($user_id) { } $sql_query = "SELECT * FROM $main_user_table WHERE user_id='$user_id'"; - $sql_result = Database::query($sql_query, __FILE__, __LINE__); + $sql_result = Database::query($sql_query); $result = Database :: fetch_array($sql_result); // check if the user is allowed to 'login_as' @@ -202,7 +202,7 @@ function login_user($user_id) { WHERE user.user_id = '".$user_id."'"; } - $sql_result = Database::query($sql_query, __FILE__, __LINE__); + $sql_result = Database::query($sql_query); if (Database::num_rows($sql_result) > 0) { @@ -309,7 +309,7 @@ function get_number_of_users() $sql.= " AND url_rel_user.access_url_id=".api_get_current_access_url_id(); } - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $obj = Database::fetch_object($res); return $obj->total_number_of_items; } @@ -324,7 +324,7 @@ function get_number_of_users() function get_user_data($from, $number_of_items, $column, $direction) { global $_configuration,$origin; - + $user_table = Database :: get_main_table(TABLE_MAIN_USER); $admin_table = Database :: get_main_table(TABLE_MAIN_ADMIN); $sql = "SELECT @@ -343,7 +343,7 @@ function get_user_data($from, $number_of_items, $column, $direction) ", u.expiration_date AS exp ". " FROM $user_table u "; - // adding the filter to see the user's only of the current access_url + // 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) { $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)"; @@ -400,7 +400,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $sql .= " ORDER BY col$column $direction "; $sql .= " LIMIT $from,$number_of_items"; - $res = Database::query($sql, __FILE__, __LINE__); + $res = Database::query($sql); $users = array (); $t = time(); @@ -412,7 +412,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $photo = '
'.api_get_person_name($user[2],$user[3]).'
'; } else { $photo = '
'.api_get_person_name($user[2], $user[3]).'
'; - } + } if ($user[7] == 1 && $user[9] != '0000-00-00 00:00:00') { // check expiration date @@ -422,7 +422,7 @@ function get_user_data($from, $number_of_items, $column, $direction) $user[7] = '-1'; } } - // forget about the expiration date field + // forget about the expiration date field $users[] = array($user[0],$photo,$user[1],$user[2],$user[3],$user[4],$user[5],$user[6],$user[7],$user[8]); } return $users; @@ -503,17 +503,17 @@ function modify_filter($user_id,$url_params,$row) } if ($is_admin) { $result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> 22, 'heigth'=> 22)); - + } else { - $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator')); + $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator')); } - + if ($row['7'] == $statusname[DRH]) { $result .= ''.Display::return_icon('addd.gif', get_lang('Add')).'  '; $result .= ''.Display::return_icon('addd.gif', get_lang('Add')).'  '; - $result .= ''.Display::return_icon('addd.gif', get_lang('Add')).'  '; + $result .= ''.Display::return_icon('addd.gif', get_lang('Add')).'  '; } - + return $result; } @@ -573,7 +573,7 @@ function lock_unlock_user($status,$user_id) if(($status_db=='1' OR $status_db=='0') AND is_numeric($user_id)) { $sql="UPDATE $user_table SET active='".Database::escape_string($status_db)."' WHERE user_id='".Database::escape_string($user_id)."'"; - $result = Database::query($sql, __FILE__, __LINE__); + $result = Database::query($sql); } if ($result) @@ -660,7 +660,7 @@ else // to prevent too long messages if ($_GET['warn'] == 'session_message'){ $_GET['warn'] = $_SESSION['session_message_import_users']; - } + } Display::display_warning_message(urldecode($_GET['warn']),false); } if (!empty($_GET['message'])) { @@ -775,7 +775,7 @@ else $table = new SortableTable('users', 'get_number_of_users', 'get_user_data', (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2); $table->set_additional_parameters($parameters); $table->set_header(0, '', false); - $table->set_header(1, get_lang('Photo'), false); + $table->set_header(1, get_lang('Photo'), false); $table->set_header(2, get_lang('OfficialCode')); if (api_is_western_name_order()) { $table->set_header(3, get_lang('FirstName'));