chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature #5397 - Replacing api_store_result() with Database::store_result().

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 9a289e1002
commit a6779b91f9
10 changed files with 19 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      main/admin/add_many_session_to_category.php
  2. 2
      main/admin/resume_session.php
  3. 2
      main/admin/session_add.php
  4. 2
      main/admin/session_category_list.php
  5. 6
      main/admin/session_course_user.php
  6. 2
      main/admin/session_edit.php
  7. 4
      main/course_home/activity.php
  8. 4
      main/inc/lib/main_api.lib.php
  9. 6
      main/inc/lib/usermanager.lib.php
  10. 4
      user_portal.php

6
main/admin/add_many_session_to_category.php
Unescape View File

@ -154,16 +154,16 @@ if(isset($_POST['CategorySessionId']) && $_POST['formSent'] == 0 ){
$where = 'WHERE session_category_id !='.intval($_POST['CategorySessionId']); $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'; $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,__FILE__,__LINE__);
$rows_category_session = api_store_result($result); $rows_category_session = Database::store_result($result);
} }
$sql = "SELECT id, name FROM $tbl_session_category ORDER BY name"; $sql = "SELECT id, name FROM $tbl_session_category ORDER BY name";
$result=Database::query($sql,__FILE__,__LINE__); $result=Database::query($sql,__FILE__,__LINE__);
$rows_session_category = api_store_result($result); $rows_session_category = Database::store_result($result);
$sql = "SELECT id, name FROM $tbl_session $where ORDER BY name"; $sql = "SELECT id, name FROM $tbl_session $where ORDER BY name";
$result=Database::query($sql,__FILE__,__LINE__); $result=Database::query($sql,__FILE__,__LINE__);
$rows_session = api_store_result($result); $rows_session = Database::store_result($result);
?> ?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $_GET['page']; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>> <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $_GET['page']; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
<input type="hidden" name="formSent" value="1" /> <input type="hidden" name="formSent" value="1" />

2
main/admin/resume_session.php
Unescape View File

@ -58,7 +58,7 @@ $sql = 'SELECT name FROM '.$tbl_session_category.' WHERE id = "'.intval($sessio
$rs = Database::query($sql, __FILE__, __LINE__); $rs = Database::query($sql, __FILE__, __LINE__);
$session_category = ''; $session_category = '';
if(mysql_num_rows($rs)>0) { if(mysql_num_rows($rs)>0) {
$rows_session_category = api_store_result($rs); $rows_session_category = Database::store_result($rs);
$rows_session_category = $rows_session_category[0]; $rows_session_category = $rows_session_category[0];
$session_category = $rows_session_category['name']; $session_category = $rows_session_category['name'];
} }

2
main/admin/session_add.php
Unescape View File

@ -203,7 +203,7 @@ if (intval($count_users)<50) {
$tbl_session_category = Database::get_main_table(TABLE_MAIN_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'; $sql = 'SELECT id, name FROM '.$tbl_session_category.' ORDER BY name ASC';
$result = Database::query($sql,__FILE__,__LINE__); $result = Database::query($sql,__FILE__,__LINE__);
$Categories = api_store_result($result); $Categories = Database::store_result($result);
?> ?>
<tr> <tr>
<td width="40%"><?php echo get_lang('SessionCategory') ?></td> <td width="40%"><?php echo get_lang('SessionCategory') ?></td>

2
main/admin/session_category_list.php
Unescape View File

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

6
main/admin/session_course_user.php
Unescape View File

@ -73,7 +73,7 @@ if ($_POST['formSent']) {
WHERE id_user = $id_user and session_rel_course.id_session = $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, __FILE__, __LINE__);
$existingCourses = api_store_result($rs); $existingCourses = Database::store_result($rs);
if (count($CourseList) == count($existingCourses)) { if (count($CourseList) == count($existingCourses)) {
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('MaybeYouWantToDeleteThisUserFromSession')); header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user.'&msg='.get_lang('MaybeYouWantToDeleteThisUserFromSession'));
exit; exit;
@ -170,10 +170,10 @@ if ($_configuration['multiple_access_urls']==true) {
}*/ }*/
$result=Database::query($sql,__FILE__,__LINE__); $result=Database::query($sql,__FILE__,__LINE__);
$Courses=api_store_result($result); $Courses=Database::store_result($result);
$result=Database::query($sql_all,__FILE__,__LINE__); $result=Database::query($sql_all,__FILE__,__LINE__);
$CoursesAll=api_store_result($result); $CoursesAll=Database::store_result($result);
$course_temp = array(); $course_temp = array();
foreach($Courses as $course) { foreach($Courses as $course) {

2
main/admin/session_edit.php
Unescape View File

@ -127,7 +127,7 @@ unset($Coaches);
//$access_url_id = api_get_current_access_url_id(); //$access_url_id = api_get_current_access_url_id();
$sql = 'SELECT id, name FROM '.$tbl_session_category.' ORDER BY name ASC'; $sql = 'SELECT id, name FROM '.$tbl_session_category.' ORDER BY name ASC';
$result = Database::query($sql,__FILE__,__LINE__); $result = Database::query($sql,__FILE__,__LINE__);
$Categories = api_store_result($result); $Categories = Database::store_result($result);
?> ?>
<tr> <tr>
<td width="30%"><?php echo get_lang('SessionCategory') ?></td> <td width="30%"><?php echo get_lang('SessionCategory') ?></td>

4
main/course_home/activity.php
Unescape View File

@ -522,14 +522,14 @@ function show_session_data($id_session) {
WHERE '.$session_table.'.id='.$id_session; WHERE '.$session_table.'.id='.$id_session;
$rs = Database::query($sql, __FILE__, __LINE__); $rs = Database::query($sql, __FILE__, __LINE__);
$session = api_store_result($rs); $session = Database::store_result($rs);
$session = $session[0]; $session = $session[0];
$sql_category = 'SELECT name FROM '.$session_category_table.' WHERE id = "'.intval($session['session_category_id']).'"'; $sql_category = 'SELECT name FROM '.$session_category_table.' WHERE id = "'.intval($session['session_category_id']).'"';
$rs_category = Database::query($sql_category, __FILE__, __LINE__); $rs_category = Database::query($sql_category, __FILE__, __LINE__);
$session_category = ''; $session_category = '';
if (mysql_num_rows($rs_category) > 0) { if (mysql_num_rows($rs_category) > 0) {
$rows_session_category = api_store_result($rs_category); $rows_session_category = Database::store_result($rs_category);
$rows_session_category = $rows_session_category[0]; $rows_session_category = $rows_session_category[0];
$session_category = $rows_session_category['name']; $session_category = $rows_session_category['name'];
} }

4
main/inc/lib/main_api.lib.php
Unescape View File

@ -1686,7 +1686,7 @@ function api_is_coach($session_id = 0, $course_code = '') {
ORDER BY date_start, date_end, name"; ORDER BY date_start, date_end, name";
$result = Database::query($sql,__FILE__,__LINE__); $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 $sql = "SELECT DISTINCT id, name, date_start, date_end
FROM session FROM session
@ -1695,7 +1695,7 @@ function api_is_coach($session_id = 0, $course_code = '') {
ORDER BY date_start, date_end, name"; ORDER BY date_start, date_end, name";
$result = Database::query($sql,__FILE__,__LINE__); $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); return (count($sessionIsCoach) > 0);

6
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1644,8 +1644,8 @@ class UserManager {
AND (date_start <= CURDATE() AND date_end >= CURDATE() OR date_start='0000-00-00') AND (date_start <= CURDATE() AND date_end >= CURDATE() OR date_start='0000-00-00')
ORDER BY date_start, date_end, name"; ORDER BY date_start, date_end, name";
$result = Database::query($sessions_sql,__FILE__,__LINE__); $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 student where visibility = SESSION_VISIBLE_READ_ONLY = 1 SESSION_VISIBLE = 2 // get the list of sessions where the user is subscribed as student where visibility = SESSION_VISIBLE_READ_ONLY = 1 SESSION_VISIBLE = 2
@ -1655,7 +1655,7 @@ class UserManager {
AND (date_end <= CURDATE() AND date_end<>'0000-00-00') AND (visibility = ".SESSION_VISIBLE_READ_ONLY." || visibility = ".SESSION_VISIBLE.") AND (date_end <= CURDATE() AND date_end<>'0000-00-00') AND (visibility = ".SESSION_VISIBLE_READ_ONLY." || visibility = ".SESSION_VISIBLE.")
ORDER BY date_start, date_end, name"; ORDER BY date_start, date_end, name";
$result_out_date = Database::query($sessions_out_date_sql,__FILE__,__LINE__); $result_out_date = Database::query($sessions_out_date_sql,__FILE__,__LINE__);
$sessions_out_date=api_store_result($result_out_date); $sessions_out_date=Database::store_result($result_out_date);
$sessions = array_merge($sessions , $sessions_out_date); $sessions = array_merge($sessions , $sessions_out_date);

4
user_portal.php
Unescape View File

@ -590,7 +590,7 @@ function get_logged_user_course_html($course, $session_id = 0, $class='courses')
WHERE ts.id='.(int) $my_course['id_session']. ' LIMIT 1'; WHERE ts.id='.(int) $my_course['id_session']. ' LIMIT 1';
$rs = Database::query($sql, __FILE__, __LINE__); $rs = Database::query($sql, __FILE__, __LINE__);
$sessioncoach = api_store_result($rs); $sessioncoach = Database::store_result($rs);
$sessioncoach = $sessioncoach[0]; $sessioncoach = $sessioncoach[0];
$session = array(); $session = array();
@ -640,7 +640,7 @@ function get_session_title_box($session_id) {
ON ts.id_coach = tu.user_id ON ts.id_coach = tu.user_id
WHERE ts.id='.intval($session_id); WHERE ts.id='.intval($session_id);
$rs = Database::query($sql, __FILE__, __LINE__); $rs = Database::query($sql, __FILE__, __LINE__);
$session_info = api_store_result($rs); $session_info = Database::store_result($rs);
$session_info = $session_info[0]; $session_info = $session_info[0];
$session = array(); $session = array();
$session['title'] = $session_info[2]; $session['title'] = $session_info[2];

Write Preview
Loading…
Cancel
Save