Feature #306 - Replacing everywhere the function api_store_result() with Database::store_result().

skala
Ivan Tcholakov 16 years ago
parent 3df4b63151
commit 302eb4dc0e
  1. 4
      main/admin/access_url_add_courses_to_url.php
  2. 4
      main/admin/access_url_add_sessions_to_url.php
  3. 4
      main/admin/access_url_add_users_to_url.php
  4. 2
      main/admin/access_url_edit_courses_to_url.php
  5. 2
      main/admin/access_url_edit_sessions_to_url.php
  6. 2
      main/admin/access_url_edit_users_to_url.php
  7. 8
      main/admin/add_courses_to_session.php
  8. 6
      main/admin/add_users_to_session.php
  9. 2
      main/admin/configure_homepage.php
  10. 2
      main/admin/course_category.php
  11. 2
      main/admin/ldap_import_students_to_session.php
  12. 4
      main/admin/ldap_synchro.php
  13. 6
      main/admin/resume_session.php
  14. 2
      main/admin/session_add.php
  15. 2
      main/admin/session_course_edit.php
  16. 2
      main/admin/session_course_list.php
  17. 2
      main/admin/session_course_user_list.php
  18. 2
      main/admin/session_edit.php
  19. 2
      main/admin/session_export.php
  20. 2
      main/admin/session_list.php
  21. 4
      main/admin/subscribe_class2course.php
  22. 4
      main/admin/subscribe_user2class.php
  23. 4
      main/admin/subscribe_user2course.php
  24. 4
      main/admin/user_information.php
  25. 2
      main/chat/chat_whoisonline.php
  26. 6
      main/forum/forumfunction.inc.php
  27. 2
      main/gradebook/lib/be/evaluation.class.php
  28. 2
      main/gradebook/lib/gradebook_functions_users.inc.php
  29. 2
      main/gradebook/lib/scoredisplay.class.php
  30. 2
      main/inc/lib/course.lib.php
  31. 5
      main/inc/lib/database.lib.php
  32. 12
      main/inc/lib/main_api.lib.php
  33. 4
      main/inc/lib/sessionmanager.lib.php
  34. 14
      main/inc/lib/urlmanager.lib.php
  35. 10
      main/inc/lib/usermanager.lib.php
  36. 2
      main/inc/local.inc.php
  37. 2
      main/mySpace/index.php
  38. 2
      main/mySpace/user_add.php
  39. 2
      main/newscorm/learnpath.class.php
  40. 2
      main/online/online_master.php
  41. 2
      main/online/online_whoisonline.php
  42. 22
      main/reservation/rsys.php
  43. 2
      main/social/profile.php
  44. 4
      main/webservices/registration.soap.php
  45. 9
      tests/main/inc/lib/database.lib.test.php
  46. 8
      tests/main/inc/lib/main_api.lib.test.php
  47. 2
      user_portal.php

@ -131,12 +131,12 @@ $sql = "SELECT code, title FROM $tbl_course
ORDER BY title, code DESC ";
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_courses = api_store_result($result);
$db_courses = Database::store_result($result);
unset($result);
$sql = "SELECT id, url FROM $tbl_access_url WHERE active=1 ORDER BY url";
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_urls = api_store_result($result);
$db_urls = Database::store_result($result);
unset($result);
?>

@ -129,12 +129,12 @@ $sql = "SELECT id, name FROM $tbl_session
ORDER BY name DESC ";
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_sessions = api_store_result($result);
$db_sessions = Database::store_result($result);
unset($result);
$sql = "SELECT id, url FROM $tbl_access_url WHERE active=1 ORDER BY url";
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_urls = api_store_result($result);
$db_urls = Database::store_result($result);
unset($result);
?>

@ -134,12 +134,12 @@ $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 = api_sql_query($sql, __FILE__, __LINE__);
$db_users = api_store_result($result);
$db_users = Database::store_result($result);
unset($result);
$sql = "SELECT id, url FROM $tbl_access_url WHERE active=1 ORDER BY url";
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_urls = api_store_result($result);
$db_urls = Database::store_result($result);
unset($result);
?>

@ -198,7 +198,7 @@ if($ajax_search) {
FROM $tbl_course u
ORDER BY title, code";
$result=api_sql_query($sql,__FILE__,__LINE__);
$courses=api_store_result($result);
$courses=Database::store_result($result);
$course_list_leys = array_keys($course_list);
foreach($courses as $course) {
if (!in_array($course['code'],$course_list_leys))

@ -194,7 +194,7 @@ if($ajax_search) {
FROM $tbl_session u
ORDER BY name, id";
$result=api_sql_query($sql,__FILE__,__LINE__);
$sessions=api_store_result($result);
$sessions=Database::store_result($result);
$session_list_leys = array_keys($session_list);
foreach($sessions as $session) {
if (!in_array($session['id'],$session_list_leys))

@ -196,7 +196,7 @@ if($ajax_search) {
FROM $tbl_user u".
$order_clause;
$result=api_sql_query($sql,__FILE__,__LINE__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
$user_list_leys = array_keys($sessionUsersList);
foreach($Users as $user) {
if (!in_array($user['user_id'],$user_list_leys))

@ -210,13 +210,13 @@ if ($_POST['formSent']) {
$id_coach = $id_coach[0];
$rs = api_sql_query("SELECT course_code FROM $tbl_session_rel_course WHERE id_session=$id_session");
$existingCourses = api_store_result($rs);
$existingCourses = Database::store_result($rs);
$sql="SELECT id_user
FROM $tbl_session_rel_user
WHERE id_session = $id_session";
$result=api_sql_query($sql,__FILE__,__LINE__);
$UserList=api_store_result($result);
$UserList=Database::store_result($result);
foreach($CourseList as $enreg_course) {
@ -321,7 +321,7 @@ if ($ajax_search) {
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Courses=api_store_result($result);
$Courses=Database::store_result($result);
foreach($Courses as $course) {
$sessionCourses[$course['code']] = $course ;
@ -351,7 +351,7 @@ if ($ajax_search) {
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Courses=api_store_result($result);
$Courses=Database::store_result($result);
foreach($Courses as $course) {
if ($course['id_session'] == $id_session) {
$sessionCourses[$course['code']] = $course ;

@ -293,7 +293,7 @@ if ($ajax_search) {
}
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
foreach ($Users as $user) {
$sessionUsersList[$user['user_id']] = $user ;
}
@ -375,7 +375,7 @@ if ($ajax_search) {
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
//var_dump($_REQUEST['id_session']);
foreach ($Users as $user) {
if($user['id_session'] != $id_session)
@ -408,7 +408,7 @@ if ($ajax_search) {
}
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
foreach($Users as $key_user_list =>$value_user_list) {
if ($Users[$key_user_list]['user_id']==$user_anonymous) {

@ -588,7 +588,7 @@ if(!empty($action)) {
else //if $action is empty, then prepare a list of the course categories to display (?)
{
$result=api_sql_query("SELECT name FROM $tbl_category WHERE parent_id IS NULL ORDER BY tree_pos",__FILE__,__LINE__);
$Categories=api_store_result($result);
$Categories=Database::store_result($result);
}
// -------------------------

@ -129,7 +129,7 @@ if(empty($action))
$myquery="SELECT t1.name,t1.code,t1.parent_id,t1.tree_pos,t1.children_count,COUNT(DISTINCT t3.code) AS nbr_courses FROM $tbl_category t1 LEFT JOIN $tbl_category t2 ON t1.code=t2.parent_id LEFT JOIN $tbl_course t3 ON t3.category_code=t1.code WHERE t1.parent_id ".(empty($category)?"IS NULL":"='$category'")." GROUP BY t1.name,t1.code,t1.parent_id,t1.tree_pos,t1.children_count ORDER BY t1.tree_pos";
$result=api_sql_query($myquery,__FILE__,__LINE__);
$Categories=api_store_result($result);
$Categories=Database::store_result($result);
}

@ -94,7 +94,7 @@ elseif(!empty($annee) && empty($id_session))
" ORDER BY name";
$result = api_sql_query($sql,__FILE__,__LINE__);
$sessions=api_store_result($result);
$sessions=Database::store_result($result);
$nbr_results=count($sessions);
foreach($sessions as $row)
{

@ -61,10 +61,10 @@ $tbl_session_rel_etape = "session_rel_etape";
$message="";
$result=api_sql_query("SELECT id, name FROM $tbl_session",__FILE__,__LINE__);
$Sessions=api_store_result($result);
$Sessions=Database::store_result($result);
$result=api_sql_query($sql,__FILE__,__LINE__);
$users=api_store_result($result);
$users=Database::store_result($result);
foreach($Sessions as $session){
$id_session = $session['id'];

@ -45,7 +45,7 @@ $sql = 'SELECT name, nbr_courses, nbr_users, nbr_classes, DATE_FORMAT(date_start
WHERE '.$tbl_session.'.id='.$id_session;
$rs = api_sql_query($sql, __FILE__, __LINE__);
$session = api_store_result($rs);
$session = Database::store_result($rs);
$session = $session[0];
if(!api_is_platform_admin() && $session['session_admin_id']!=$_user['user_id'])
@ -185,7 +185,7 @@ else {
AND id_session='$id_session'
ORDER BY title";
$result=api_sql_query($sql,__FILE__,__LINE__);
$courses=api_store_result($result);
$courses=Database::store_result($result);
foreach($courses as $course){
//select the number of users
$sql = 'SELECT COUNT(id_user) as nb_users FROM '.$tbl_session_rel_course_rel_user.' WHERE course_code="'.Database::escape_string($course['code']).'" AND id_session='.intval($id_session);
@ -243,7 +243,7 @@ else {
AND '.$tbl_session_rel_user.'.id_session = '.$id_session.$order_clause;
$result=api_sql_query($sql,__FILE__,__LINE__);
$users=api_store_result($result);
$users=Database::store_result($result);
$orig_param = '&origin=resume_session&id_session='.$id_session; // change breadcrumb in destination page
foreach($users as $user){
echo '<tr>

@ -177,7 +177,7 @@ if (intval($count_users)<50) {
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Coaches=api_store_result($result);
$Coaches=Database::store_result($result);
?>
<select name="coach_username" value="true" style="width:250px;">
<option value="0"><?php get_lang('None'); ?></option>

@ -69,7 +69,7 @@ $sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1'
$result=api_sql_query($sql,__FILE__,__LINE__);
$coaches=api_store_result($result);
$coaches=Database::store_result($result);
Display::display_header($tool_name);

@ -60,7 +60,7 @@ $limit=20;
$from=$page * $limit;
$result=api_sql_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__);
$Courses=api_store_result($result);
$Courses=Database::store_result($result);
$nbr_results=sizeof($Sessions);
$tool_name = api_htmlentities($session_name,ENT_QUOTES,$charset).' : '.get_lang('CourseListInSession');

@ -53,7 +53,7 @@ $from=$page * $limit;
$is_western_name_order = api_is_western_name_order();
$result=api_sql_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__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
$nbr_results=sizeof($Users);

@ -75,7 +75,7 @@ if ($_configuration['multiple_access_urls']==true){
$result=api_sql_query($sql,__FILE__,__LINE__);
$Coaches=api_store_result($result);
$Coaches=Database::store_result($result);
$thisYear=date('Y');
// display the header

@ -272,7 +272,7 @@ if ($_configuration['multiple_access_urls']==true) {
$result=api_sql_query($sql,__FILE__,__LINE__);
$Sessions=api_store_result($result);
$Sessions=Database::store_result($result);
?>
<?php

@ -138,7 +138,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$num = $recorset['total_rows'];
$result=api_sql_query($query,__FILE__,__LINE__);
$Sessions=api_store_result($result);
$Sessions=Database::store_result($result);
$nbr_results=sizeof($Sessions);
$tool_name = get_lang('SessionList');
Display::display_header($tool_name);

@ -100,10 +100,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 = api_sql_query($sql, __FILE__, __LINE__);
$db_classes = api_store_result($result);
$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 = api_sql_query($sql, __FILE__, __LINE__);
$db_courses = api_store_result($result);
$db_courses = Database::store_result($result);
if (!empty ($error_message))
{
Display :: display_normal_message($error_message);

@ -116,10 +116,10 @@ Display :: display_header($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 = api_sql_query($sql, __FILE__, __LINE__);
$left_users = api_store_result($result);
$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 = api_sql_query($sql, __FILE__, __LINE__);
$right_users = api_store_result($result);
$right_users = Database::store_result($result);
if (!empty ($error_message))
{
Display :: display_normal_message($error_message);

@ -239,7 +239,7 @@ if ($_configuration['multiple_access_urls']==true) {
}
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_users = api_store_result($result);
$db_users = Database::store_result($result);
unset($result);
$sql = "SELECT code,visual_code,title FROM $tbl_course WHERE visual_code LIKE '".$first_letter_course."%' ORDER BY ". (count($courses) > 0 ? "(code IN('".implode("','", $courses)."')) DESC," : "")." visual_code";
@ -257,7 +257,7 @@ if ($_configuration['multiple_access_urls']==true) {
}
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_courses = api_store_result($result);
$db_courses = Database::store_result($result);
unset($result);
if ($_configuration['multiple_access_urls']==true) {

@ -115,7 +115,7 @@ $result=api_sql_query("SELECT DISTINCT id, name, date_start, date_end
AND (date_start <= NOW() AND date_end >= NOW() OR date_start='0000-00-00')
ORDER BY date_start, date_end, name",__FILE__,__LINE__);
$sessions=api_store_result($result);
$sessions=Database::store_result($result);
// get the list of sessions where the user is subscribed as coach in a course
$result=api_sql_query("SELECT DISTINCT id, name, date_start, date_end
@ -125,7 +125,7 @@ $result=api_sql_query("SELECT DISTINCT id, name, date_start, date_end
AND (date_start <= NOW() AND date_end >= NOW() OR date_start='0000-00-00')
ORDER BY date_start, date_end, name",__FILE__,__LINE__);
$session_is_coach = api_store_result($result);
$session_is_coach = Database::store_result($result);
$personal_course_list = array();

@ -64,7 +64,7 @@ if (!empty($course))
{
$query="SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,t3.status FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_course_user t3 WHERE t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND t3.course_code = '".$_course['sysCode']."' AND t2.last_connection>'".$date_inter."' ORDER BY username";
$result=api_sql_query($query,__FILE__,__LINE__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
}
else
{

@ -3766,7 +3766,7 @@ function count_number_of_post_in_thread($thread_id) {
global $table_posts;
$sql = "SELECT * FROM $table_posts WHERE thread_id='".Database::escape_string($thread_id)."' ";
$result = api_sql_query($sql, __FILE__, __LINE__);
return count(api_store_result($result));
return count(Database::store_result($result));
}
/**
@ -3782,7 +3782,7 @@ function count_number_of_post_for_user_thread($thread_id, $user_id) {
$sql = "SELECT * FROM $table_posts WHERE thread_id='".Database::escape_string($thread_id)."'
AND poster_id = '".Database::escape_string($user_id)."' ";
$result = api_sql_query($sql, __FILE__, __LINE__);
return count(api_store_result($result));
return count(Database::store_result($result));
}
/**
@ -3796,7 +3796,7 @@ function count_number_of_user_in_course($course_id) {
$table_course_rel_user = Database::get_main_table("course_rel_user");
$sql = "SELECT * FROM $table_course_rel_user WHERE course_code ='".Database::escape_string($course_id)."' ";
$result = api_sql_query($sql, __FILE__, __LINE__);
return count(api_store_result($result));
return count(Database::store_result($result));
}
/**

@ -561,7 +561,7 @@ class Evaluation implements GradebookItem
.' ORDER BY lastname';
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_users = api_store_result($result);
$db_users = Database::store_result($result);
return $db_users;
}

@ -122,7 +122,7 @@ function find_students($mask= '') {
}
$sql .= ' ORDER BY lastname';
$result= api_sql_query($sql, __FILE__, __LINE__);
$db_users= api_store_result($result);
$db_users= Database::store_result($result);
return $db_users;
}

@ -341,7 +341,7 @@ class ScoreDisplay
$sql = 'SELECT * FROM '.$tbl_display.' ORDER BY score';
//echo $sql;
$result = api_sql_query($sql, __FILE__, __LINE__);
return api_store_result($result);
return Database::store_result($result);
}

@ -207,7 +207,7 @@ class CourseManager {
$sql .= ' OFFSET 0';
}
$res = Database::query($sql, __FILE__, __LINE__);
return api_store_result($res);
return Database::store_result($res);
}
/**

@ -15,9 +15,6 @@
==============================================================================
*/
// TODO: It seems more natural if the function api_store_result() in
// the main API had an implementation here as Database::store_result()
/*
==============================================================================
CONSTANTS
@ -505,7 +502,7 @@ class Database {
*/
public static function get_course_list() {
$table = self::get_main_table(TABLE_MAIN_COURSE);
return api_store_result(self::query("SELECT * FROM $table", __FILE__, __LINE__));
return self::store_result(self::query("SELECT * FROM $table", __FILE__, __LINE__));
}
/**

@ -1538,14 +1538,14 @@ function api_is_coach() {
ON session_rel_course.id_coach = '".Database::escape_string($_user['user_id'])."'
ORDER BY date_start, date_end, name";
$result = Database::query($sql, __FILE__, __LINE__);
$sessionIsCoach = api_store_result($result);
$sessionIsCoach = Database::store_result($result);
$sql = "SELECT DISTINCT id, name, date_start, date_end
FROM session
WHERE session.id_coach = '".Database::escape_string($_user['user_id'])."'
ORDER BY date_start, date_end, name";
$result = Database::query($sql, __FILE__, __LINE__);
$sessionIsCoach = array_merge($sessionIsCoach, api_store_result($result));
$sessionIsCoach = array_merge($sessionIsCoach, Database::store_result($result));
return count($sessionIsCoach) > 0;
}
@ -2767,7 +2767,7 @@ function api_get_access_urls($from = 0, $to = 1000000, $order = 'url', $directio
$direction = Database::escape_string($direction);
$sql = "SELECT id, url, description, active, created_by, tms FROM $t_au ORDER BY $order $direction LIMIT $to OFFSET $from";
$res = Database::query($sql, __FILE__, __LINE__);
return api_store_result($res);
return Database::store_result($res);
}
/**
@ -2850,7 +2850,7 @@ function api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url
$sql .= " ORDER BY 1,2 ASC";
}
$res = Database::query($sql, __FILE__, __LINE__);
return api_store_result($res);
return Database::store_result($res);
}
/**
@ -2868,7 +2868,7 @@ function api_get_settings_categories($exceptions = array(), $access_url = 1) {
$sql .= " WHERE category NOT IN ($list)";
}
$r = Database::query($sql, __FILE__, __LINE__);
return api_store_result($r);
return Database::store_result($r);
}
/**
@ -3123,7 +3123,7 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
LIMIT 1";
$result = Database::query($sql, __FILE__, __LINE__);
$row = api_store_result($result);
$row = Database::store_result($result);
if ($row[0]['id_coach'] == $userid) {
$_courseUser['role'] = 'Professor';

@ -373,14 +373,14 @@ class SessionManager {
$id_coach = $id_coach[0];
// get list of courses subscribed to this session
$rs = api_sql_query("SELECT course_code FROM $tbl_session_rel_course WHERE id_session=$id_session");
$existingCourses = api_store_result($rs);
$existingCourses = Database::store_result($rs);
$nbr_courses=count($existingCourses);
// get list of users subscribed to this session
$sql="SELECT id_user
FROM $tbl_session_rel_user
WHERE id_session = $id_session";
$result=api_sql_query($sql,__FILE__,__LINE__);
$user_list=api_store_result($result);
$user_list=Database::store_result($result);
// remove existing courses from the session
if ($empty_courses===true) {

@ -167,7 +167,7 @@ class UrlManager
/** Gets the inner join of users and urls table
* @author Julio Montoya
* @return int access url id
* @return array api_store_result of the result
* @return array Database::store_result of the result
* */
function get_url_rel_user_data($access_url_id='')
{
@ -184,7 +184,7 @@ class UrlManager
ON $table_url_rel_user.user_id = u.user_id
$where".$order_clause;
$result=api_sql_query($sql,__FILE__,__LINE__);
$users=api_store_result($result);
$users=Database::store_result($result);
return $users;
}
@ -192,7 +192,7 @@ class UrlManager
/** Gets the inner join of access_url and the course table
* @author Julio Montoya
* @return int access url id
* @return array api_store_result of the result
* @return array Database::store_result of the result
* */
function get_url_rel_course_data($access_url_id='')
{
@ -211,14 +211,14 @@ class UrlManager
ORDER BY title, code";
$result=api_sql_query($sql,__FILE__,__LINE__);
$courses=api_store_result($result);
$courses=Database::store_result($result);
return $courses;
}
/** Gets the inner join of access_url and the session table
* @author Julio Montoya
* @return int access url id
* @return array api_store_result of the result
* @return array Database::store_result of the result
* */
function get_url_rel_session_data($access_url_id='')
{
@ -237,7 +237,7 @@ class UrlManager
ORDER BY name, id";
$result=api_sql_query($sql,__FILE__,__LINE__);
$sessions=api_store_result($result);
$sessions=Database::store_result($result);
return $sessions;
}
@ -612,7 +612,7 @@ class UrlManager
ON (url_rel_user.access_url_id = u.id)
WHERE user_id = ".Database::escape_string($user_id);
$result = api_sql_query($sql, __FILE__, __LINE__);
$url_list = api_store_result($result);
$url_list = Database::store_result($result);
return $url_list;
}

@ -1047,7 +1047,7 @@ class UserManager {
ON fields.id = options.field_id
AND fields.field_variable="'.Database::escape_string($field_name).'"';
$rs = Database::query($sql, __FILE__, __LINE__);
return api_store_result($rs);
return Database::store_result($rs);
}
/**
@ -1558,9 +1558,9 @@ class UserManager {
ORDER BY date_start, date_end, name";
$result = Database::query($sessions_sql, __FILE__, __LINE__);
$sessions=api_store_result($result);
$sessions=Database::store_result($result);
$sessions = array_merge($sessions, api_store_result($result));
$sessions = array_merge($sessions, Database::store_result($result));
// get the list of sessions where the user is subscribed as coach in a course
$sessions_sql = "SELECT DISTINCT id, name, date_start, date_end, DATE_SUB(date_start, INTERVAL nb_days_access_before_beginning DAY), ADDDATE(date_end, INTERVAL nb_days_access_after_end DAY)
@ -1575,7 +1575,7 @@ class UserManager {
$result = Database::query($sessions_sql, __FILE__, __LINE__);
$session_is_coach = api_store_result($result);
$session_is_coach = Database::store_result($result);
$sessions = array_merge($sessions, $session_is_coach);
@ -1589,7 +1589,7 @@ class UserManager {
ORDER BY date_start, date_end, name";
$result = Database::query($sessions_sql, __FILE__, __LINE__);
$sessions = array_merge($sessions, api_store_result($result));
$sessions = array_merge($sessions, Database::store_result($result));
if (api_is_allowed_to_create_course()) {
foreach($sessions as $enreg) {

@ -943,7 +943,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
AND session_rel_course.course_code='$_cid'";
$result = api_sql_query($sql,__FILE__,__LINE__);
$row = api_store_result($result);
$row = Database::store_result($result);
if ($row[0]['id_coach']==$_user['user_id']) {
$_courseUser['role'] = 'Professor';

@ -109,7 +109,7 @@ if (api_is_allowed_to_create_course()) {
}
$result_nb_cours = Database::query($sql_nb_cours, __FILE__, __LINE__);
$courses = api_store_result($result_nb_cours);
$courses = Database::store_result($result_nb_cours);
$nb_teacher_courses = count($courses);
if ($nb_teacher_courses) {

@ -175,7 +175,7 @@ if (api_is_session_admin()) {
FROM $tbl_session
$where
ORDER BY name",__FILE__,__LINE__);
$a_sessions = api_store_result($result);
$a_sessions = Database::store_result($result);
$session_list = array();
$session_list[0] = get_lang('SelectSession');
if (is_array($a_sessions)) {

@ -7683,7 +7683,7 @@ class learnpath {
$return = '<div class="lp_resource_header"' . " onclick=\"if(document.getElementById('resDoc').style.display == 'block') {document.getElementById('resDoc').style.display = 'none';} else {document.getElementById('resDoc').style.display = 'block';}\"" . '>'.Display::return_icon('folder_document.gif',get_lang('Documents'),array('style'=>'margin-right:5px;', 'height' => '16px')).' '. get_lang('Documents') . '</div>';
$return .= '<div class="lp_resource_elements" id="resDoc">';
$resources = api_store_result($res_doc);
$resources = Database::store_result($res_doc);
$resources_sorted = array ();

@ -117,7 +117,7 @@ if(!$isMaster)
$query="SELECT id,name,url FROM $tbl_online_link ORDER BY name";
$result=api_sql_query($query,__FILE__,__LINE__);
$Links=api_store_result($result);
$Links=Database::store_result($result);
}
include('header_frame.inc.php');

@ -62,7 +62,7 @@ $pictureURL=api_get_path(WEB_CODE_PATH).'upload/users/';
$query="SELECT t1.user_id,t1.username,t1.firstname,t1.lastname,t1.picture_uri,t3.status FROM $tbl_user t1,$tbl_online_connected t2,$tbl_course_user t3 WHERE t1.user_id=t2.user_id AND t3.user_id=t1.user_id AND t3.course_code = '".$_course[sysCode]."' AND t2.last_connection>'".date('Y-m-d H:i:s',time()-60*5)."' ORDER BY t1.username";
$result=api_sql_query($query,__FILE__,__LINE__);
$Users=api_store_result($result);
$Users=Database::store_result($result);
include('header_frame.inc.php');
?>

@ -230,7 +230,7 @@ class Rsys {
$sql .= " WHERE id = ".Database::escape_string($id)."";
else
$sql .= " ORDER BY ".$orderby;
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
if (!empty ($id))
return $arr[0];
else
@ -252,7 +252,7 @@ class Rsys {
WHERE (cu.user_id='".api_get_user_id()."' AND ir.view_right=1) OR i.creator='".api_get_user_id()."' OR 1=". (api_is_platform_admin() ? 1 : 0)."
GROUP BY c.id ORDER BY ".$orderby;
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
@ -271,7 +271,7 @@ class Rsys {
WHERE (cu.user_id='".api_get_user_id()."' AND (ir.edit_right=1 OR ir.delete_right=1)) OR i.creator='".api_get_user_id()."' OR 1=". (api_is_platform_admin() ? 1 : 0)."
GROUP BY c.id ORDER BY ".$orderby;
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
@ -450,7 +450,7 @@ class Rsys {
$sql .= " WHERE i.id = '".$id."'";
} else
$sql .= " LEFT JOIN ".Rsys :: getTable("item_rights")." ir ON ir.item_id=i.id LEFT JOIN ".Database :: get_main_table(TABLE_MAIN_CLASS)." c ON ir.class_id=c.id AND ir.item_id = i.id LEFT JOIN ".Database :: get_main_table(TABLE_MAIN_CLASS_USER)." cu ON cu.class_id = c.id WHERE (cu.user_id='".api_get_user_id()."' AND ir.view_right=1) OR i.creator='".api_get_user_id()."' OR 1=". (api_is_platform_admin() ? 1 : 0)." ORDER BY ".$orderby;
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
if (!empty ($id))
return $arr[0]; // Return one row only
else
@ -478,7 +478,7 @@ class Rsys {
*/
function get_category_items($id, $orderby = "name ASC") {
$sql = "SELECT * FROM ".Rsys :: getTable("item")." WHERE category_id = ".Database::escape_string($id)." ORDER BY ".$orderby;
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
@ -491,7 +491,7 @@ class Rsys {
*/
function get_course_items($id, $orderby = "name ASC") {
$sql = "SELECT * FROM ".Rsys :: getTable("item")." WHERE course_id = ".Database::escape_string($id)." ORDER BY ".$orderby;
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
@ -655,7 +655,7 @@ class Rsys {
$item_id = Database::escape_string($item_id);
$sql = "SELECT * FROM ".Database :: get_main_table(TABLE_MAIN_CLASS)."
WHERE id NOT IN (SELECT class_id FROM ".Rsys :: getTable("item_rights")." WHERE item_id='".$item_id."') ORDER BY name ASC, code ASC";
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
@ -725,7 +725,7 @@ class Rsys {
function get_class_group($class_id) {
$class_id = Database::escape_string($class_id);
$sql = "SELECT * FROM ".Database :: get_main_table(TABLE_MAIN_CLASS)." WHERE id='".$class_id."'";
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
@ -734,14 +734,14 @@ class Rsys {
$class_id = Database::escape_string($class_id);
$sql = "SELECT * FROM ".Rsys :: getTable('item_rights')." WHERE item_id='".$item_id."' AND class_id='".$class_id."'";
$arr = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$arr = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
return $arr;
}
function black_out_changer($item_id) {
$item_id = Database::escape_string($item_id);
$sql = "SELECT blackout FROM ".Rsys :: getTable("item")." WHERE id='".$item_id."'";
$Value = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$Value = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
($Value[0][0] == 0 ? $changedValue = 1 : $changedValue = 0);
$sql = "UPDATE ".Rsys :: getTable("item")." SET blackout='".$changedValue."' WHERE id = '".$item_id."'";
api_sql_query($sql, __FILE__, __LINE__);
@ -1527,7 +1527,7 @@ class Rsys {
INNER JOIN ".Rsys :: getTable("reservation")." r ON s.reservation_id = r.id
INNER JOIN ".Rsys :: getTable("item")." i ON r.item_id = i.id
WHERE reservation_id='".$reservation_id."' AND user_id='".$user_id."'";
$result = api_store_result(api_sql_query($sql, __FILE__, __LINE__));
$result = Database::store_result(api_sql_query($sql, __FILE__, __LINE__));
$user_info = api_get_user_info();
$titel = str_replace('#ITEM#', $result[0][1], get_lang("ReservationMadeTitle"));
$inhoud = str_replace('#ITEM#', $result[0][1], str_replace('#START#', $result[0][2], str_replace('#END#', $result[0][3], get_lang("ReservationMadeMessage"))));

@ -374,7 +374,7 @@ function get_logged_user_course_html($my_course, $count) {
ON ts.id_coach = tu.user_id
WHERE ts.id='.(int) $my_course['id_session']. ' LIMIT 1';
$rs = api_sql_query($sql, __FILE__, __LINE__);
$sessioncoach = api_store_result($rs);
$sessioncoach = Database::store_result($rs);
$sessioncoach = $sessioncoach[0];
$session = array();

@ -4552,7 +4552,7 @@ function DokeosWSSuscribeCoursesToSession($params) {
$sql = "SELECT course_code FROM $tbl_session_rel_course WHERE id_session='$id_session'";
$rs = Database::query($sql, __FILE__, __LINE__);
$existingCourses = api_store_result($rs);
$existingCourses = Database::store_result($rs);
$nbr_courses=count($existingCourses);
// get list of users subscribed to this session
@ -4560,7 +4560,7 @@ function DokeosWSSuscribeCoursesToSession($params) {
FROM $tbl_session_rel_user
WHERE id_session = '$id_session'";
$result=Database::query($sql, __FILE__, __LINE__);
$user_list=api_store_result($result);
$user_list=Database::store_result($result);
$course_directory = array();
// Pass through the courses list we want to add to the session.

@ -288,5 +288,14 @@ class TestDatabase extends UnitTestCase {
//var_dump($res);
$this->assertTrue(is_bool($res));
}
function testStoreResult(){
$sql="SELECT 1";
$resource=$this->dbase->query($sql,__FILE__,__LINE__);
$res = $this->dbase->store_result($resource);
$this->assertTrue(is_array($res));
//var_dump($res);
}
}
?>

@ -231,12 +231,6 @@ class TestMainApi extends UnitTestCase {
//var_dump($res);
}
function testApiStoreResult(){
$res = api_store_result();
$this->assertTrue(is_array($res));
//var_dump($res);
}
function testApiSessionStart(){
$res = api_session_start($already_sintalled=true);
$this->assertTrue(is_null($res));
@ -432,7 +426,7 @@ class TestMainApi extends UnitTestCase {
global $_user;
global $sessionIsCoach;
$_user['user_id']=2;
$sessionIsCoach=api_store_result($result=false);
$sessionIsCoach=Database::store_result($result=false);
$res=api_is_coach();
$this->assertTrue(is_bool($res));
//var_dump($res);

@ -531,7 +531,7 @@ function get_logged_user_course_html($my_course) {
WHERE ts.id='.(int) $my_course['id_session']. ' LIMIT 1';
$rs = api_sql_query($sql, __FILE__, __LINE__);
$sessioncoach = api_store_result($rs);
$sessioncoach = Database::store_result($rs);
$sessioncoach = $sessioncoach[0];
$session = array();

Loading…
Cancel
Save