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 mysql_result() with Database::result().

Browse Source
skala
Ivan Tcholakov 16 years ago
parent dab3646394
commit 66d5d81ec3
6 changed files with 27 additions and 27 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. 2
      main/admin/add_courses_to_session.php
  2. 2
      main/admin/calendar.php
  3. 2
      main/admin/resume_session.php
  4. 2
      main/course_info/infocours.php
  5. 44
      main/inc/lib/surveymanager.lib.php
  6. 2
      tests/main/inc/lib/surveymanager.lib.test.php

2
main/admin/add_courses_to_session.php
Unescape View File

@ -290,7 +290,7 @@ echo '<div class="row"><div class="form_header">'.$tool_name.' ('.$session_info[
/*$sql = 'SELECT COUNT(1) FROM '.$tbl_course; /*$sql = 'SELECT COUNT(1) FROM '.$tbl_course;
$rs = Database::query($sql, __FILE__, __LINE__); $rs = Database::query($sql, __FILE__, __LINE__);
$count_courses = mysql_result($rs, 0, 0);*/ $count_courses = Database::result($rs, 0, 0);*/
$ajax_search = $add_type == 'unique' ? true : false; $ajax_search = $add_type == 'unique' ? true : false;
$nosessionCourses = $sessionCourses = array(); $nosessionCourses = $sessionCourses = array();

2
main/admin/calendar.php
Unescape View File

@ -61,7 +61,7 @@ if(!api_is_platform_admin())
{ {
$sql = 'SELECT session_admin_id FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$id_session; $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,__FILE__,__LINE__);
if(mysql_result($rs,0,0)!=$_user['user_id']) if(Database::result($rs,0,0)!=$_user['user_id'])
{ {
api_not_allowed(true); api_not_allowed(true);
} }

2
main/admin/resume_session.php
Unescape View File

@ -219,7 +219,7 @@ else {
AND srcru.id_session = '".intval($id_session)."'"; AND srcru.id_session = '".intval($id_session)."'";
$rs = Database::query($sql, __FILE__, __LINE__); $rs = Database::query($sql, __FILE__, __LINE__);
$course['nbr_users'] = mysql_result($rs,0,0); $course['nbr_users'] = Database::result($rs,0,0);
// Get coachs of the courses in session // Get coachs of the courses in session

2
main/course_info/infocours.php
Unescape View File

@ -111,7 +111,7 @@ $res = Database::query($sql, __FILE__, __LINE__);
$s_select_course_tutor_name="SELECT tutor_name FROM $tbl_course WHERE code='$course_code'"; $s_select_course_tutor_name="SELECT tutor_name FROM $tbl_course WHERE code='$course_code'";
$q_tutor=Database::query($s_select_course_tutor_name, __FILE__, __LINE__); $q_tutor=Database::query($s_select_course_tutor_name, __FILE__, __LINE__);
$s_tutor=mysql_result($q_tutor,0,"tutor_name"); $s_tutor=Database::result($q_tutor,0,"tutor_name");
$s_sql_course_titular="SELECT DISTINCT username, lastname, firstname FROM $tbl_user as user, $tbl_course_user as course_rel_user WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND course_code='".$course_code."'"; $s_sql_course_titular="SELECT DISTINCT username, lastname, firstname FROM $tbl_user as user, $tbl_course_user as course_rel_user WHERE (course_rel_user.status='1') AND user.user_id=course_rel_user.user_id AND course_code='".$course_code."'";
$q_result_titulars=Database::query($s_sql_course_titular, __FILE__, __LINE__); $q_result_titulars=Database::query($s_sql_course_titular, __FILE__, __LINE__);

44
main/inc/lib/surveymanager.lib.php
Unescape View File

@ -72,7 +72,7 @@ class SurveyManager {
$sql = "SELECT survey_id FROM $survey_table WHERE title='$existing'" ; $sql = "SELECT survey_id FROM $survey_table WHERE title='$existing'" ;
$result = Database::query($sql,__FILE__,__LINE__); $result = Database::query($sql,__FILE__,__LINE__);
$i=0; $i=0;
$survey_id=mysql_result($result,$i,'survey_id'); $survey_id=Database::result($result,$i,'survey_id');
echo "in getsurveyid".$survey_id; echo "in getsurveyid".$survey_id;
return(survey_id); return(survey_id);
} }
@ -114,7 +114,7 @@ class SurveyManager {
$authorid = Database::escape_string($authorid); $authorid = Database::escape_string($authorid);
$sql_query = "SELECT * FROM $user_table WHERE user_id='$authorid'"; $sql_query = "SELECT * FROM $user_table WHERE user_id='$authorid'";
$res = Database::query($sql_query, __FILE__, __LINE__); $res = Database::query($sql_query, __FILE__, __LINE__);
$firstname=@mysql_result($res,0,'firstname'); $firstname=@Database::result($res,0,'firstname');
return $firstname; return $firstname;
} }
@ -127,7 +127,7 @@ class SurveyManager {
$survey_id = Database::escape_string($survey_id); $survey_id = Database::escape_string($survey_id);
$sql = "SELECT author FROM $db_name.survey WHERE survey_id='$survey_id'"; $sql = "SELECT author FROM $db_name.survey WHERE survey_id='$survey_id'";
$res = Database::query($sql, __FILE__, __LINE__); $res = Database::query($sql, __FILE__, __LINE__);
$author=@mysql_result($res,0,'author'); $author=@Database::result($res,0,'author');
return $author; return $author;
} }
/** /**
@ -139,7 +139,7 @@ class SurveyManager {
$group_id = Database::escape_string($group_id); $group_id = Database::escape_string($group_id);
$sql = "SELECT survey_id FROM $db_name.survey_group WHERE group_id='$group_id'"; $sql = "SELECT survey_id FROM $db_name.survey_group WHERE group_id='$group_id'";
$res = Database::query($sql, __FILE__, __LINE__); $res = Database::query($sql, __FILE__, __LINE__);
$surveyid=@mysql_result($res,0,'survey_id'); $surveyid=@Database::result($res,0,'survey_id');
return $surveyid; return $surveyid;
} }
@ -174,7 +174,7 @@ class SurveyManager {
//echo $sql; //echo $sql;
//exit; //exit;
$result=Database::query($sql); $result=Database::query($sql);
$code=@mysql_result($result,0,'code'); $code=@Database::result($result,0,'code');
//echo $code;exit; //echo $code;exit;
return($code); return($code);
} }
@ -306,7 +306,7 @@ class SurveyManager {
$table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION); $table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION);
$sql = "SELECT * FROM $table_question where qid='$questionid'"; $sql = "SELECT * FROM $table_question where qid='$questionid'";
$res=Database::query($sql); $res=Database::query($sql);
$code=@mysql_result($res,0,'caption'); $code=@Database::result($res,0,'caption');
return($code); return($code);
} }
*/ */
@ -384,7 +384,7 @@ class SurveyManager {
$questionid = Database::escape_string($questionid); $questionid = Database::escape_string($questionid);
$sql = "SELECT * FROM $table_question WHERE qid='$questionid'"; $sql = "SELECT * FROM $table_question WHERE qid='$questionid'";
$res=Database::query($sql); $res=Database::query($sql);
$code=@mysql_result($res,0,'type'); $code=@Database::result($res,0,'type');
return($code); return($code);
} }
@ -425,7 +425,7 @@ class SurveyManager {
global $_course; global $_course;
$sql='SELECT '.$field.' FROM '.$_course['dbName'].'.survey WHERE survey_id='.intval($id); $sql='SELECT '.$field.' FROM '.$_course['dbName'].'.survey WHERE survey_id='.intval($id);
$res=Database::query($sql); $res=Database::query($sql);
$code=@mysql_result($res,0); $code=@Database::result($res,0);
return($code); return($code);
} }
@ -448,7 +448,7 @@ class SurveyManager {
$sid = Database::escape_string($sid); $sid = Database::escape_string($sid);
$sql="SELECT * FROM $db_name.survey WHERE survey_id=$sid"; $sql="SELECT * FROM $db_name.survey WHERE survey_id=$sid";
$res=Database::query($sql); $res=Database::query($sql);
$code=@mysql_result($res,0,'title'); $code=@Database::result($res,0,'title');
return($code); return($code);
} }
/** /**
@ -460,7 +460,7 @@ class SurveyManager {
$surveytable=Database:: get_course_table(TABLE_SURVEY); $surveytable=Database:: get_course_table(TABLE_SURVEY);
$sql="SELECT * FROM $surveytable WHERE survey_id=$sid"; $sql="SELECT * FROM $surveytable WHERE survey_id=$sid";
$res=Database::query($sql); $res=Database::query($sql);
$code=@mysql_result($res,0,'title'); $code=@Database::result($res,0,'title');
return($code); return($code);
} }
@ -579,7 +579,7 @@ class SurveyManager {
$ques_table=Database::get_course_table(TABLE_MAIN_SURVEYQUESTION); $ques_table=Database::get_course_table(TABLE_MAIN_SURVEYQUESTION);
$sql="SELECT gid FROM $ques_table where qid=$qid"; $sql="SELECT gid FROM $ques_table where qid=$qid";
$res=Database::query($sql); $res=Database::query($sql);
$id=@mysql_result($res,0,'gid'); $id=@Database::result($res,0,'gid');
$gname=surveymanager::get_groupname($id); $gname=surveymanager::get_groupname($id);
return($gname); return($gname);
} }
@ -646,7 +646,7 @@ class SurveyManager {
for($k=0;$k<$numrs;$k++) for($k=0;$k<$numrs;$k++)
{ {
$imp[]=mysql_result($rs,$k,"imported_group"); $imp[]=Database::result($rs,$k,"imported_group");
} }
@ -844,7 +844,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
$count_def_check = mysql_num_rows($res_def_check); $count_def_check = mysql_num_rows($res_def_check);
for($ctr=0;$ctr<$count_def_check;$ctr++) for($ctr=0;$ctr<$count_def_check;$ctr++)
{ {
$imp[]=mysql_result($res_def_check,$ctr,"imported_group"); $imp[]=Database::result($res_def_check,$ctr,"imported_group");
} }
$imp = @array_unique($imp); $imp = @array_unique($imp);
if(!@in_array($gid_arr[$p],$imp)) if(!@in_array($gid_arr[$p],$imp))
@ -897,7 +897,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
$num_check = mysql_num_rows($res_check); $num_check = mysql_num_rows($res_check);
for($k=0;$k<$num_check;$k++) for($k=0;$k<$num_check;$k++)
{ {
$imp[]=mysql_result($res_check,$k,"imported_group"); $imp[]=Database::result($res_check,$k,"imported_group");
} }
$imp = @array_unique($imp); $imp = @array_unique($imp);
if(!@in_array($gid_arr[$p],$imp)) if(!@in_array($gid_arr[$p],$imp))
@ -979,7 +979,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
$count_def_check = mysql_num_rows($res_def_check); $count_def_check = mysql_num_rows($res_def_check);
for($ctr=0;$ctr<$count_def_check;$ctr++) for($ctr=0;$ctr<$count_def_check;$ctr++)
{ {
$imp[]=mysql_result($res_def_check,$ctr,"imported_group"); $imp[]=Database::result($res_def_check,$ctr,"imported_group");
} }
$imp = @array_unique($imp); $imp = @array_unique($imp);
$gid_arr[$p]; $gid_arr[$p];
@ -1033,7 +1033,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
$num_check = mysql_num_rows($res_check); $num_check = mysql_num_rows($res_check);
for($k=0;$k<$num_check;$k++) for($k=0;$k<$num_check;$k++)
{ {
$imp[]=mysql_result($res_check,$k,"imported_group"); $imp[]=Database::result($res_check,$k,"imported_group");
} }
$imp = @array_unique($imp); $imp = @array_unique($imp);
if(!@in_array($gid_arr[$p],$imp)) if(!@in_array($gid_arr[$p],$imp))
@ -1227,7 +1227,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
$count_def_check = mysql_num_rows($res_def_check); $count_def_check = mysql_num_rows($res_def_check);
for($ctr=0;$ctr<$count_def_check;$ctr++) for($ctr=0;$ctr<$count_def_check;$ctr++)
{ {
$imp[]=mysql_result($res_def_check,$ctr,"imported_group"); $imp[]=Database::result($res_def_check,$ctr,"imported_group");
} }
$imp = @array_unique($imp); $imp = @array_unique($imp);
if(!@in_array($gid_arr[$p],$imp)) if(!@in_array($gid_arr[$p],$imp))
@ -1280,7 +1280,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
$num_check = mysql_num_rows($res_check); $num_check = mysql_num_rows($res_check);
for($k=0;$k<$num_check;$k++) for($k=0;$k<$num_check;$k++)
{ {
$imp[]=mysql_result($res_check,$k,"imported_group"); $imp[]=Database::result($res_check,$k,"imported_group");
} }
$imp = @array_unique($imp); $imp = @array_unique($imp);
if(!@in_array($gid_arr[$p],$imp)) if(!@in_array($gid_arr[$p],$imp))
@ -1339,7 +1339,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
$surveytable=Database:: get_course_table(TABLE_SURVEY); $surveytable=Database:: get_course_table(TABLE_SURVEY);
$sql="SELECT * FROM $surveytable WHERE survey_id=$sid"; $sql="SELECT * FROM $surveytable WHERE survey_id=$sid";
$res=Database::query($sql); $res=Database::query($sql);
$code=@mysql_result($res,0,'title'); $code=@Database::result($res,0,'title');
return($code); return($code);
} }
/** /**
@ -1350,7 +1350,7 @@ function pick_author($survey_id)
$survey_table = Database :: get_course_table(TABLE_SURVEY); $survey_table = Database :: get_course_table(TABLE_SURVEY);
$sql = "SELECT author FROM $survey_table WHERE survey_id='$survey_id'"; $sql = "SELECT author FROM $survey_table WHERE survey_id='$survey_id'";
$res = Database::query($sql, __FILE__, __LINE__); $res = Database::query($sql, __FILE__, __LINE__);
$author=@mysql_result($res,0,'author'); $author=@Database::result($res,0,'author');
return $author; return $author;
} }
/** /**
@ -1511,8 +1511,8 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
$count = mysql_num_rows($res_ques); $count = mysql_num_rows($res_ques);
for($j=0;$j<$count;$j++) for($j=0;$j<$count;$j++)
{ {
$check_qid[] = mysql_result($res_ques,$j,"imported_question"); $check_qid[] = Database::result($res_ques,$j,"imported_question");
$check_db[] = mysql_result($res_ques,$j,"db_name"); $check_db[] = Database::result($res_ques,$j,"db_name");
} }
$check_qid = @array_unique($check_qid); $check_qid = @array_unique($check_qid);
$check_db = @array_unique($check_db); $check_db = @array_unique($check_db);

2
tests/main/inc/lib/surveymanager.lib.test.php
Unescape View File

@ -194,7 +194,7 @@ class TestSurveyManager extends UnitTestCase {
$authorid = Database::escape_string($authorid); $authorid = Database::escape_string($authorid);
$sql_query = "SELECT * FROM $user_table WHERE user_id='$authorid'"; $sql_query = "SELECT * FROM $user_table WHERE user_id='$authorid'";
$res = Database::query($sql_query, __FILE__, __LINE__); $res = Database::query($sql_query, __FILE__, __LINE__);
$firstname=@mysql_result($res,0,'firstname'); $firstname=@Database::result($res,0,'firstname');
$res=SurveyManager::get_survey_author($authorid); $res=SurveyManager::get_survey_author($authorid);
$this->assertTrue(is_bool($firstname)); $this->assertTrue(is_bool($firstname));
//var_dump($firstname); //var_dump($firstname);

Write Preview
Loading…
Cancel
Save