Преглед изворни кода

Feature #5397 - Replacing mysql_fetch_object() with Database::fetch_object(). Installation scripts are skipped in this transaction.

Ivan Tcholakov пре 15 година
родитељ
комит
f87ebd4795

+ 1 - 1
main/admin/course_add.php

@@ -74,7 +74,7 @@ if ($_configuration['multiple_access_urls']==true){
 $res = Database::query($sql,__FILE__,__LINE__);
 $teachers = array();
 $teachers[0] = '-- '.get_lang('NoManager').' --';
-while($obj = mysql_fetch_object($res))
+while($obj = Database::fetch_object($res))
 {
 	$teachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
 }

+ 4 - 4
main/admin/course_information.php

@@ -28,7 +28,7 @@ function get_course_usage($course_code)
     $course_code = Database::escape_string($course_code);
 	$sql = "SELECT * FROM $table WHERE code='".$course_code."'";
 	$res = Database::query($sql,__FILE__,__LINE__);
-	$course = mysql_fetch_object($res);
+	$course = Database::fetch_object($res);
 	// Learnpaths
 	$table = Database :: get_course_table(TABLE_LP_MAIN, $course->db_name);
 	$usage[] = array (get_lang(ucfirst(TOOL_LEARNPATH)), Database::count_rows($table));
@@ -66,7 +66,7 @@ $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
 $code = Database::escape_string($_GET['code']);
 $sql = "SELECT * FROM $table_course WHERE code = '".$code."'";
 $res = Database::query($sql,__FILE__,__LINE__);
-$course = mysql_fetch_object($res);
+$course = Database::fetch_object($res);
 $tool_name = $course->title.' ('.$course->visual_code.')';
 Display::display_header($tool_name);
 //api_display_tool_title($tool_name);
@@ -107,7 +107,7 @@ $is_western_name_order = api_is_western_name_order();
 if (mysql_num_rows($res) > 0)
 {
 	$users = array ();
-	while ($obj = mysql_fetch_object($res))
+	while ($obj = Database::fetch_object($res))
 	{
 		$user = array ();
 		$user[] = $obj->official_code;
@@ -160,7 +160,7 @@ $res = Database::query($sql,__FILE__,__LINE__);
 if (mysql_num_rows($res) > 0)
 {
 	$data = array ();
-	while ($class = mysql_fetch_object($res))
+	while ($class = Database::fetch_object($res))
 	{
 		$row = array ();
 		$row[] = $class->name;

+ 1 - 1
main/admin/user_export.php

@@ -68,7 +68,7 @@ if ($_configuration['multiple_access_urls']==true) {
 	}
 }
 $result = Database::query($sql, __FILE__, __LINE__);
-while ($course = mysql_fetch_object($result))
+while ($course = Database::fetch_object($result))
 {
 	$courses[$course->code] = $course->visual_code.' - '.$course->title;
 }

+ 7 - 7
main/admin/user_information.php

@@ -155,12 +155,12 @@ if(count($sessions)>0){
 										ON session_course.id_session = session.id
 									 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  	 
-		$personal_course_list_sql = "SELECT distinct course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, 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.id_coach = 3,'2', '5') 
-										FROM $tbl_session_course_user as session_course_user INNER JOIN $tbl_course AS course 
+		*/
+		// 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, 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.id_coach = 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 INNER JOIN $tbl_session as session ON session_course_user.id_session = session.id
-										INNER JOIN $tbl_session_course as session_course 
+										INNER JOIN $tbl_session_course as session_course
 										LEFT JOIN $tbl_user as user ON user.user_id = session_course.id_coach
 										WHERE session_course_user.id_user = $user_id  ORDER BY i";
 
@@ -221,7 +221,7 @@ if (Database::num_rows($res) > 0)
 	$header[] = array (get_lang('Status'), true);
 	$header[] = array ('', false);
 	$data = array ();
-	while ($course = mysql_fetch_object($res))
+	while ($course = Database::fetch_object($res))
 	{
 		$row = array ();
 		$row[] = $course->code;
@@ -261,7 +261,7 @@ if (Database::num_rows($res) > 0)
 	$header[] = array (get_lang('ClassName'), true);
 	$header[] = array ('', false);
 	$data = array ();
-	while ($class = mysql_fetch_object($res))
+	while ($class = Database::fetch_object($res))
 	{
 		$row = array();
 		$row[] = $class->name;

+ 2 - 2
main/coursecopy/classes/CourseRecycler.class.php

@@ -189,7 +189,7 @@ class CourseRecycler
 		$table_forumcat = Database :: get_course_table(TABLE_FORUM_CATEGORY);
 		$sql = "SELECT fc.cat_id FROM ".$table_forumcat." fc LEFT JOIN ".$table_forum." f ON fc.cat_id=f.forum_category WHERE f.forum_id IS NULL";
 		$res = Database::query($sql,__FILE__,__LINE__);
-		while ($obj = mysql_fetch_object($res))
+		while ($obj = Database::fetch_object($res))
 		{
 			$sql = "DELETE FROM ".$table_forumcat." WHERE cat_id = ".$obj->cat_id;
 			Database::query($sql,__FILE__,__LINE__);
@@ -205,7 +205,7 @@ class CourseRecycler
 		$link_table = Database :: get_course_table(TABLE_LINK);
 		$sql = "SELECT lc.id FROM ".$link_cat_table." lc LEFT JOIN ".$link_table." l ON lc.id=l.category_id WHERE l.id IS NULL";
 		$res = Database::query($sql,__FILE__,__LINE__);
-		while ($obj = mysql_fetch_object($res))
+		while ($obj = Database::fetch_object($res))
 		{
 			$sql = "DELETE FROM ".$link_cat_table." WHERE id = ".$obj->id;
 			Database::query($sql,__FILE__,__LINE__);

+ 1 - 1
main/coursecopy/copy_course.php

@@ -110,7 +110,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
 	<?php
 	echo get_lang('SelectDestinationCourse');
 	echo ' <select name="destination_course"/>';
-	while ($obj = mysql_fetch_object($res)) {
+	while ($obj = Database::fetch_object($res)) {
 		echo '<option value="'.$obj->code.'">'.$obj->title.'</option>';
 	}
 	echo '</select>';

+ 2 - 2
main/exercice/answer.class.php

@@ -122,7 +122,7 @@ class Answer
 		$i=1;
 
 		// while a record is found
-		while($object=mysql_fetch_object($result))
+		while($object=Database::fetch_object($result))
 		{
 			$this->id[$i]=$object->id;
 			$this->answer[$i]=$object->answer;
@@ -170,7 +170,7 @@ class Answer
 		$i=1;
 
 		// while a record is found
-		while($object=mysql_fetch_object($result))
+		while($object=Database::fetch_object($result))
 		{
 			$this->answer[$i]=$object->answer;
 			$this->correct[$i]=$object->correct;

+ 3 - 3
main/exercice/question.class.php

@@ -91,7 +91,7 @@ abstract class Question
 		$result=Database::query($sql,__FILE__,__LINE__);
 
 		// if the question has been found
-		if($object=mysql_fetch_object($result))
+		if($object=Database::fetch_object($result))
 		{
 			$objQuestion = Question::getInstance($object->type);
 			$objQuestion->id=$id;
@@ -107,7 +107,7 @@ abstract class Question
 			$result=Database::query($sql,__FILE__,__LINE__);
 
 			// fills the array with the exercises which this question is in
-			while($object=mysql_fetch_object($result))
+			while($object=Database::fetch_object($result))
 			{
 				$objQuestion->exerciseList[]=$object->exercice_id;
 			}
@@ -1004,7 +1004,7 @@ abstract class Question
 		$editor_config = array('ToolbarSet' => 'TestQuestionDescription', 'Width' => '100%', 'Height' => '150');
 		if(is_array($fck_config)){
 			$editor_config = array_merge($editor_config, $fck_config);
-		}		
+		}
 		if(!api_is_allowed_to_edit(null,true)) $editor_config['UserStatus'] = 'student';
 
 		$form -> addElement('html','<div class="row">

+ 3 - 3
main/inc/lib/classmanager.lib.php

@@ -194,7 +194,7 @@ class ClassManager
 		Database::query($sql, __FILE__, __LINE__);
 		$sql = "SELECT user_id FROM $tbl_class_user WHERE class_id = '".mysql_real_escape_string($class_id)."'";
 		$res = Database::query($sql, __FILE__, __LINE__);
-		while ($user = mysql_fetch_object($res))
+		while ($user = Database::fetch_object($res))
 		{
 			CourseManager :: subscribe_user($user->user_id, $course_code);
 		}
@@ -212,7 +212,7 @@ class ClassManager
 		$tbl_class_user = Database :: get_main_table(TABLE_MAIN_CLASS_USER);
 		$sql = "SELECT cu.user_id,COUNT(cc.class_id) FROM $tbl_course_class cc, $tbl_class_user cu WHERE  cc.class_id = cu.class_id AND cc.course_code = '".mysql_real_escape_string($course_code)."' GROUP BY cu.user_id HAVING COUNT(cc.class_id) = 1";
 		$single_class_users = Database::query($sql, __FILE__, __LINE__);
-		while ($single_class_user = mysql_fetch_object($single_class_users))
+		while ($single_class_user = Database::fetch_object($single_class_users))
 		{
 			$sql = "SELECT * FROM $tbl_class_user WHERE class_id = '".mysql_real_escape_string($class_id)."' AND user_id = '".mysql_real_escape_string($single_class_user->user_id)."'";
 			$res = Database::query($sql, __FILE__, __LINE__);
@@ -238,7 +238,7 @@ class ClassManager
 		$table_class = Database :: get_main_table(TABLE_MAIN_CLASS);
 		$sql = "SELECT * FROM $table_class WHERE name='".$name."'";
 		$res = Database::query($sql, __FILE__, __LINE__);
-		$obj = mysql_fetch_object($res);
+		$obj = Database::fetch_object($res);
 		return $obj->id;
 	}
 	/**

+ 49 - 49
main/inc/lib/surveymanager.lib.php

@@ -261,7 +261,7 @@ class SurveyManager {
 	{
           $sql_course = "SELECT * FROM $table_course WHERE code = '$cidReq'";
           $res_course = Database::query($sql_course,__FILE__,__LINE__);
-          $obj_course=@mysql_fetch_object($res_course);
+          $obj_course=@Database::fetch_object($res_course);
           $curr_dbname = $obj_course->db_name ;
           $surveyid = Database::escape_string($surveyid);
 		  $sql = "UPDATE $curr_dbname.survey SET code='$surveycode', title='$surveytitle', subtitle='$surveysubtitle', lang='$survey_language',   avail_from='$availablefrom', avail_till='$availabletill', is_shared='$isshare', template='$surveytemplate', intro='$surveyintroduction',surveythanks='$surveythanks'
@@ -317,7 +317,7 @@ class SurveyManager {
 	{
     	$sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
 		$res_sort=Database::query($sql_sort);
-		$rs=mysql_fetch_object($res_sort);
+		$rs=Database::fetch_object($res_sort);
 		$sortby=$rs->sortby;
 		if(empty($sortby))
 		{
@@ -409,7 +409,7 @@ class SurveyManager {
 			$qid = Database::escape_string($qid);
 	        $sql = "SELECT * FROM $curr_dbname.questions where qid='$qid'";
 			$res=Database::query($sql);
-			$rs=mysql_fetch_object($res);
+			$rs=Database::fetch_object($res);
 			$properties = get_object_vars($rs);
 			foreach ($properties as $property=>$val){
 				$val = stripslashes($val);
@@ -437,7 +437,7 @@ class SurveyManager {
 		global $_course;
 		$sql='SELECT * FROM '.$_course['dbName'].'.survey WHERE survey_id='.intval($id);
 		$res=Database::query($sql);
-		return mysql_fetch_object($res);
+		return Database::fetch_object($res);
 	}
 	/**
 	 * Possible  deprecated method
@@ -472,7 +472,7 @@ class SurveyManager {
 		  $table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION);
 		  echo $sql="select t1.title as stitle, t3.type as type, t3.caption as caption, t2.groupname as groupname from $table_survey t1, $table_group t2, $table_question t3  where t1.survey_id=t2.survey_id  and t3.gid=t2.group_id and t3.type='$question_type'";
 		  $sql_result = Database::query($sql,__FILE__,__LINE__);
-		  $result = mysql_fetch_object($sql_result);
+		  $result = Database::fetch_object($sql_result);
 		  return ($result);
 		  }
 		  */
@@ -537,7 +537,7 @@ class SurveyManager {
 		// Deleting all the questions of the survey
 		$sql = "SELECT * FROM $table_group WHERE survey_id='".$survey_id."'";
 		$res = Database::query($sql,__FILE__,__LINE__);
-		while($obj = mysql_fetch_object($res))
+		while($obj = Database::fetch_object($res))
 		{
 			$sql = "DELETE FROM $table_question WHERE gid='".$obj->group_id."'";
 			Database::query($sql,__FILE__,__LINE__);
@@ -682,7 +682,7 @@ class SurveyManager {
 				$sql = "SELECT * FROM $table_question WHERE gid = '$temp_gid'";
 				$res = Database::query($sql);
 				$num_rows = mysql_num_rows($res);
-				while($obj = mysql_fetch_object($res))
+				while($obj = Database::fetch_object($res))
 				{
 					$temp_qtype = $obj->qtype;
 					$temp_caption = $obj->caption;
@@ -733,13 +733,13 @@ class SurveyManager {
 		//echo "ths is num".$num;
 		$parameters = array();
 		$displays = array();
-		while($obj = @mysql_fetch_object($res))
+		while($obj = @Database::fetch_object($res))
 		{
 
 			$groupid = $obj->group_id;
 			$query = "SELECT * FROM $table_question WHERE gid = '$groupid'";
 			$result = Database::query($query);
-		  while($object = @mysql_fetch_object($result))
+		  while($object = @Database::fetch_object($result))
 			{
 				$display = array();
 				$display[] = '<input type="checkbox" name="course[]" value="'.$object->qid.'"/>';
@@ -767,7 +767,7 @@ class SurveyManager {
 	  {
 	 $sql = "SELECT *  FROM $db_name.survey_group WHERE survey_id = '$surveyid'";
      $res = Database::query($sql,__FILE__,__LINE__);
-	 while($obj=@mysql_fetch_object($res))
+	 while($obj=@Database::fetch_object($res))
      {
 		 $groupname=addslashes($obj->groupname);
 		 $introduction=addslashes($obj->introduction);
@@ -776,7 +776,7 @@ class SurveyManager {
 	   $groupid = mysql_insert_id();
 	   $sql_q = "SELECT *  FROM $db_name.questions WHERE gid = '$obj->group_id'";
 	   $res_q = Database::query($sql_q,__FILE__,__LINE__);
-       while($obj_q = mysql_fetch_object($res_q))
+       while($obj_q = Database::fetch_object($res_q))
 	   {
 		 $caption1=addslashes($obj_q->caption);
 		      $a1=addslashes($obj_q->a1);
@@ -803,7 +803,7 @@ class SurveyManager {
 			  $r10=addslashes($obj_q->r10);
 		 $sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
          $res_sort=Database::query($sql_sort);
-         $rs=mysql_fetch_object($res_sort);
+         $rs=Database::fetch_object($res_sort);
 	     $sortby=$rs->sortby;
 	     if(empty($sortby))
 	     {$sortby=1;}
@@ -831,13 +831,13 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 	{
 		$sql = "SELECT * FROM $table_group WHERE group_id = '$gid_arr[$p]'";
 		$res = Database::query($sql);
-		$obj = mysql_fetch_object($res);
+		$obj = Database::fetch_object($res);
 		$gname = $obj->groupname;
 		if($gname=='Default')
 		{
 			$query = "SELECT * FROM $table_group WHERE survey_id = '$sid' AND groupname = 'Default'";
 			$result = Database::query($query);
-			$object = mysql_fetch_object($result);
+			$object = Database::fetch_object($result);
 			$gid = $object->group_id;
 			$sql_def_check = "SELECT * FROM $table_question WHERE gid = '$gid'";
 			$res_def_check = Database::query($sql_def_check);
@@ -852,7 +852,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 				$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
 				$res_ques = Database::query($sql_ques);
 				$num = mysql_num_rows($res_ques);
-				while($obj_ques = mysql_fetch_object($res_ques))
+				while($obj_ques = Database::fetch_object($res_ques))
 				{
 					$temp_qtype = $obj_ques->qtype;
 					$temp_caption = $obj_ques->caption;
@@ -908,7 +908,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 			$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
 			$res_ques = Database::query($sql_ques);
 			$num = mysql_num_rows($res_ques);
-			while($obj_ques = mysql_fetch_object($res_ques))
+			while($obj_ques = Database::fetch_object($res_ques))
 			{
 				$temp_qtype = $obj_ques->qtype;
 				$temp_caption = $obj_ques->caption;
@@ -957,7 +957,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 	$table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
 	$sql = "SELECT * FROM $table_course WHERE code = '$cidReq'";
 	$res = Database::query($sql,__FILE__,__LINE__);
-	$obj_name=@mysql_fetch_object($res);
+	$obj_name=@Database::fetch_object($res);
 	$current_db_name = $obj_name->db_name ;
 	$gid_arr = explode(",",$gids);
 	$index = count($gid_arr);
@@ -966,13 +966,13 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 	{
 		$sql = "SELECT * FROM $db_name.survey_group WHERE group_id = '$gid_arr[$p]'";
 		$res = Database::query($sql);
-		$obj = mysql_fetch_object($res);
+		$obj = Database::fetch_object($res);
 		$gname = $obj->groupname;
 		if($gname=='No Group')
 		{
 			$query = "SELECT * FROM $db_name.survey_group WHERE survey_id = '$sid' AND groupname = 'No Group'";
 			$result = Database::query($query);
-			$object = mysql_fetch_object($result);
+			$object = Database::fetch_object($result);
 			$gid = $object->group_id;
 			$sql_def_check = "SELECT * FROM $db_name.questions WHERE gid = '$gid'";
 			$res_def_check = Database::query($sql_def_check);
@@ -988,7 +988,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 				$sql_ques = "SELECT * FROM $db_name.questions WHERE gid= '$gid_arr[$p]'";
 				$res_ques = Database::query($sql_ques);
 				$num = mysql_num_rows($res_ques);
-				while($obj_ques = mysql_fetch_object($res_ques))
+				while($obj_ques = Database::fetch_object($res_ques))
 				{
 					$temp_qtype = $obj_ques->qtype;
 					$temp_caption = $obj_ques->caption;
@@ -1044,7 +1044,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 			$sql_ques = "SELECT * FROM $db_name.questions WHERE gid= '$gid_arr[$p]'";
 			$res_ques = Database::query($sql_ques);
 			$num = mysql_num_rows($res_ques);
-			while($obj_ques = mysql_fetch_object($res_ques))
+			while($obj_ques = Database::fetch_object($res_ques))
 			{
 				$temp_qtype = $obj_ques->qtype;
 				$temp_caption = $obj_ques->caption;
@@ -1093,7 +1093,7 @@ function import_question($surveyid,$qids,$table_group,$table_question,$db_name,$
    $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
    $sql_course = "SELECT * FROM $table_course WHERE code = '$cidReq'";
    $res_course = Database::query($sql_course,__FILE__,__LINE__);
-   $obj_name=@mysql_fetch_object($res_course);
+   $obj_name=@Database::fetch_object($res_course);
    $current_db_name = $obj_name->db_name ;
    $qid=explode(",",$qids);
    $count = count($qid);
@@ -1101,17 +1101,17 @@ function import_question($surveyid,$qids,$table_group,$table_question,$db_name,$
    {
 	 $sql_q = "SELECT *  FROM $table_question WHERE qid = '$qid[$i]'";
      $res_q = Database::query($sql_q,__FILE__,__LINE__);
-	 $obj=@mysql_fetch_object($res_q);
+	 $obj=@Database::fetch_object($res_q);
 	 $oldgid=$obj->gid;
 	 $sql = "SELECT *  FROM $table_group WHERE group_id = '$oldgid'";
 	 $res = Database::query($sql,__FILE__,__LINE__);
-	 $obj_gr = @mysql_fetch_object($res);
+	 $obj_gr = @Database::fetch_object($res);
 	 $gname = $obj_gr->groupname;
 	 $gintro = $obj_gr->introduction;
      $sql_gid = "SELECT *  FROM $table_group WHERE survey_id = '$surveyid' AND groupname = '$gname'";
 	 $res_gid = Database::query($sql_gid,__FILE__,__LINE__);
 	 $num=mysql_num_rows($res_gid);
-     $obj_gid=@mysql_fetch_object($res_gid);
+     $obj_gid=@Database::fetch_object($res_gid);
 	 $sql_quesid = "SELECT *  FROM $table_question WHERE gid = '$obj_gid->group_id' AND caption = '$obj->caption'";
      $res_quesid = Database::query($sql_quesid,__FILE__,__LINE__);
      $num_ques=mysql_num_rows($res_quesid);
@@ -1146,7 +1146,7 @@ function create_course_survey_rel($cidReq,$survey_id,$table_course,$table_course
 {
  $sql = "SELECT * FROM $table_course WHERE code = '$cidReq'";
  $res = Database::query($sql,__FILE__,__LINE__);
- $obj=@mysql_fetch_object($res);
+ $obj=@Database::fetch_object($res);
  $db_name = $obj->db_name ;
  $sql="INSERT INTO $table_course_survey_rel(id,course_code,db_name,survey_id) values('','$cidReq','$db_name','$survey_id')";
 
@@ -1164,17 +1164,17 @@ function import_existing_question($surveyid,$qids,$table_group,$table_question,$
   {
 	 $sql_q = "SELECT *  FROM $table_question WHERE qid = '$qid[$i]'";
      $res_q = Database::query($sql_q,__FILE__,__LINE__);
-	 $obj=@mysql_fetch_object($res_q);
+	 $obj=@Database::fetch_object($res_q);
 	 $oldgid=$obj->gid;
 	 $sql = "SELECT *  FROM $table_group WHERE group_id = '$oldgid'";
 	 $res = Database::query($sql,__FILE__,__LINE__);
-	 $obj_gr = @mysql_fetch_object($res);
+	 $obj_gr = @Database::fetch_object($res);
 	 $gname = $obj_gr->groupname;
 	 $gintro = $obj_gr->introduction;
      $sql_gid = "SELECT *  FROM $table_group WHERE survey_id = '$surveyid' AND groupname = '$gname'";
 	 $res_gid = Database::query($sql_gid,__FILE__,__LINE__);
 	 $num=mysql_num_rows($res_gid);
-     $obj_gid=@mysql_fetch_object($res_gid);
+     $obj_gid=@Database::fetch_object($res_gid);
 	 $sql_quesid = "SELECT *  FROM $table_question WHERE gid = '$obj_gid->group_id' AND caption = '$obj->caption'";
      $res_quesid = Database::query($sql_quesid,__FILE__,__LINE__);
      $num_ques=mysql_num_rows($res_quesid);
@@ -1214,13 +1214,13 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 	{
 		$sql = "SELECT * FROM $table_group WHERE group_id = '$gid_arr[$p]'";
 		$res = Database::query($sql);
-		$obj = mysql_fetch_object($res);
+		$obj = Database::fetch_object($res);
 		$gname = $obj->groupname;
 		if($gname=='No Group')
 		{
 			$query = "SELECT * FROM $table_group WHERE survey_id = '$sid' AND groupname = 'No Group'";
 			$result = Database::query($query);
-			$object = mysql_fetch_object($result);
+			$object = Database::fetch_object($result);
 			$gid = $object->group_id;
 			$sql_def_check = "SELECT * FROM $table_question WHERE gid = '$gid'";
 			$res_def_check = Database::query($sql_def_check);
@@ -1235,7 +1235,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 				$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
 				$res_ques = Database::query($sql_ques);
 				$num = mysql_num_rows($res_ques);
-				while($obj_ques = mysql_fetch_object($res_ques))
+				while($obj_ques = Database::fetch_object($res_ques))
 				{
 					$temp_qtype = $obj_ques->qtype;
 					$temp_caption = $obj_ques->caption;
@@ -1291,7 +1291,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 			$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
 			$res_ques = Database::query($sql_ques);
 			$num = mysql_num_rows($res_ques);
-			while($obj_ques = mysql_fetch_object($res_ques))
+			while($obj_ques = Database::fetch_object($res_ques))
 			{
 				$temp_qtype = $obj_ques->qtype;
 				$temp_caption = $obj_ques->caption;
@@ -1364,14 +1364,14 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
    {
 	 $sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
      $res_sort=Database::query($sql_sort);
-     $rs=mysql_fetch_object($res_sort);
+     $rs=Database::fetch_object($res_sort);
 	 $sortby=$rs->sortby;
 	 if(empty($sortby))
 	 {$sortby=1;}
 	 else{$sortby=$sortby+1;}
 	 $sql_q = "SELECT * FROM $db_name.questions WHERE qid = '$qid[$i]'";
      $res_q = Database::query($sql_q,__FILE__,__LINE__);
-	 $obj=@mysql_fetch_object($res_q);
+	 $obj=@Database::fetch_object($res_q);
 	 $oldgid=$obj->gid;
 	 $caption1=addslashes($obj->caption);
 	  $a1=addslashes($obj->a1);
@@ -1398,7 +1398,7 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
 			  $r10=addslashes($obj_q->r10);
      //$sql_gr = "SELECT * FROM $db_name.survey_group WHERE group_id = '$oldgid'";
      //$res_gr = Database::query($sql_gr,__FILE__,__LINE__);
-	 // $obj_gr=@mysql_fetch_object($res_gr);
+	 // $obj_gr=@Database::fetch_object($res_gr);
 	 //$groupname = $obj_gr->groupname
 	 $sql_quesid = "SELECT *  FROM $curr_dbname.questions WHERE survey_id = '$surveyid' AND imported_question = '$qid[$i]' AND db_name = '$db_name'";
      $res_quesid = Database::query($sql_quesid,__FILE__,__LINE__);
@@ -1411,11 +1411,11 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
 	 {
 	  $sql_group = "SELECT * FROM $db_name.survey_group WHERE group_id = '$oldgid'";
 	  $res_group = Database::query($sql_group,__FILE__,__LINE__);
-	  $obj_group=@mysql_fetch_object($res_group);
+	  $obj_group=@Database::fetch_object($res_group);
 	  $groupname = $obj_group->groupname;
 	  $sql = "SELECT *  FROM $curr_dbname.survey_group WHERE groupname = '$groupname' AND survey_id = '$surveyid'";
 	  $res = Database::query($sql,__FILE__,__LINE__);
-      $obj_gro = mysql_fetch_object($res);
+      $obj_gro = Database::fetch_object($res);
 	   $num_group=mysql_num_rows($res);
 	  if($num_group>0)
 	   {
@@ -1445,13 +1445,13 @@ function import_group($surveyid,$gids,$db_name,$curr_dbname)
 	{
 		$sql = "SELECT * FROM $db_name.survey_group WHERE group_id = '$gid_arr[$i]'";
 		$res = Database::query($sql,__FILE__,__LINE__);
-		$obj = mysql_fetch_object($res);
+		$obj = Database::fetch_object($res);
 		$sql_ques = "SELECT * FROM $db_name.questions WHERE gid = '$gid_arr[$i]'";
 		$res_ques = Database::query($sql_ques,__FILE__,__LINE__);
-		$obj_ques = mysql_fetch_object($res_ques);
+		$obj_ques = Database::fetch_object($res_ques);
 		$sql_check = "SELECT * FROM $curr_dbname.survey_group WHERE survey_id = '$surveyid' AND imported_group = '$gid_arr[$i]' AND db_name = '$db_name'";
 		$res_check = Database::query($sql_check);
-		$obj_check = mysql_fetch_object($res_check);
+		$obj_check = Database::fetch_object($res_check);
 		$num = mysql_num_rows($res_check);
 		if($num>0)
 		{
@@ -1493,13 +1493,13 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 	{
 		$sql = "SELECT * FROM $db_name.survey_group WHERE group_id = '$gid_arr[$i]'";
 		$res = Database::query($sql);
-		$obj = mysql_fetch_object($res);
+		$obj = Database::fetch_object($res);
 		$groupname=addslashes($obj->groupname);
 		$introduction=addslashes($obj->introduction);
 		$g_sortby = intval($obj->sortby);
 		$sql_curr = "SELECT * FROM $curr_dbname.survey_group WHERE survey_id = '$sid' AND groupname = '$obj->groupname'";
 		$res_curr = Database::query($sql_curr);
-		$obj_curr = mysql_fetch_object($res_curr);
+		$obj_curr = Database::fetch_object($res_curr);
 		$gid = $obj_curr->group_id;
 		$num = mysql_num_rows($res_curr);
 
@@ -1507,7 +1507,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 		{
 			$sql_ques = "SELECT * FROM $curr_dbname.questions WHERE gid = '$gid'";
 			$res_ques = Database::query($sql_ques);
-			$obj_ques = mysql_fetch_object($res_ques);
+			$obj_ques = Database::fetch_object($res_ques);
 			$count = mysql_num_rows($res_ques);
 			for($j=0;$j<$count;$j++)
 			{
@@ -1518,7 +1518,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			$check_db = @array_unique($check_db);
 			$sql_old = "SELECT * FROM $db_name.questions WHERE gid = '$gid_arr[$i]'";
 			$res_old = Database::query($sql_old);
-			while($obj_old = mysql_fetch_object($res_old))
+			while($obj_old = Database::fetch_object($res_old))
 			{
 			  $caption1=addslashes($obj_old->caption);
 	          $a1=addslashes($obj_old->a1);
@@ -1545,7 +1545,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			  $r10=addslashes($obj_old->r10);
 				$sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
                 $res_sort=Database::query($sql_sort);
-                $rs=mysql_fetch_object($res_sort);
+                $rs=Database::fetch_object($res_sort);
 	            $sortby=$rs->sortby;
 	            if(empty($sortby))
 	            {$sortby=1;}
@@ -1570,7 +1570,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			$group_id = mysql_insert_id();
 			$sql_old = "SELECT * FROM $db_name.questions WHERE gid = '$gid_arr[$i]'";
 			$res_old = Database::query($sql_old);
-			while($obj_old = mysql_fetch_object($res_old))
+			while($obj_old = Database::fetch_object($res_old))
 			{
 			  $caption1=addslashes($obj_old->caption);
 	          $a1=addslashes($obj_old->a1);
@@ -1597,7 +1597,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			  $r10=addslashes($obj_old->r10);
 				$sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
                 $res_sort=Database::query($sql_sort);
-                $rs=mysql_fetch_object($res_sort);
+                $rs=Database::fetch_object($res_sort);
 	            $sortby=$rs->sortby;
 	            if(empty($sortby))
 	            {$sortby=1;}
@@ -1627,7 +1627,7 @@ function get_status()
 	$table_user = Database::get_main_table(TABLE_MAIN_USER);
 	$sqlm = "SELECT  status FROM  $table_user WHERE user_id = '".mysql_real_escape_string($_user['user_id'])."'";
 	$resm = Database::query($sqlm,__FILE__,__LINE__);
-	$objm=@mysql_fetch_object($resm);
+	$objm=@Database::fetch_object($resm);
 	$ss = $objm->status ;
 	return $ss;
 }

+ 1 - 1
main/newscorm/resourcelinker.inc.php

@@ -325,7 +325,7 @@ function display_addedresource_link($type, $id, $style='')
 			$tbl_post = Database::get_course_table(TABLE_FORUM_POST);
 			$sql = "SELECT * FROM $tbl_post p WHERE post_id = $id";
 			$result = Database::query($sql,__FILE__,__LINE__);
-			$post = mysql_fetch_object($result);
+			$post = Database::fetch_object($result);
 			echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
 			break;
 		case 'Document':

+ 1 - 1
main/resourcelinker/resourcelinker.inc.php

@@ -321,7 +321,7 @@ function display_addedresource_link($type, $id, $style='')
 			$tbl_post_text = Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
 			$sql = "SELECT * FROM $tbl_post p, $tbl_post_text t WHERE p.post_id = t.post_id AND p.post_id = $id";
 			$result = Database::query($sql,__FILE__,__LINE__);
-			$post = mysql_fetch_object($result);
+			$post = Database::fetch_object($result);
 			echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
 			break;
 		case 'Document':

+ 2 - 2
main/user/subscribe_class.php

@@ -118,7 +118,7 @@ function get_number_of_classes()
 	$sql = "SELECT * FROM $course_class_table WHERE course_code = '".$_SESSION['_course']['id']."'";
 	$res = Database::query($sql,__FILE__,__LINE__);
 	$subscribed_classes = array();
-	while($obj = mysql_fetch_object($res))
+	while($obj = Database::fetch_object($res))
 	{
 		$subscribed_classes[] = $obj->class_id;
 	}
@@ -147,7 +147,7 @@ function get_class_data($from, $number_of_items, $column, $direction)
 	$sql = "SELECT * FROM $course_class_table WHERE course_code = '".$_SESSION['_course']['id']."'";
 	$res = Database::query($sql,__FILE__,__LINE__);
 	$subscribed_classes = array();
-	while($obj = mysql_fetch_object($res))
+	while($obj = Database::fetch_object($res))
 	{
 		$subscribed_classes[] = $obj->class_id;
 	}

+ 29 - 29
main/wiki/index.php

@@ -426,16 +426,16 @@ echo '<td>';
 		//menu add page
 		echo '<li><a href="index.php?cidReq='.$_course[id].'&action=addnew&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('addnew').'>'.get_lang('AddNew').'</a> ';
 	}
-	
+
 	if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
 		// page action: enable or disable the adding of new pages
 		if (check_addnewpagelock()==1)
 		{
-			
+
 			$protect_addnewpage= '<img src="../img/wiki/lockadd.gif" title="'.get_lang('AddOptionProtected').'" alt="'.get_lang('AddOptionProtected').'" width="8" height="8" />';
 			$lock_unlock_addnew='unlockaddnew';
-		
+
 		}
 		else
 		{
@@ -483,10 +483,10 @@ if (!in_array($_GET['action'], array('addnew', 'searchpages', 'allpages', 'recen
 	//menu show page
 	echo '<a href="index.php?cidReq='.$_course[id].'&action=showpage&amp;title='.$page.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('showpage').'>'.Display::display_icon('lp_document.png',get_lang('ShowThisPage')).' '.get_lang('Page').'</a>';
 
-	if (api_is_allowed_to_session_edit(false,true) ) { 
+	if (api_is_allowed_to_session_edit(false,true) ) {
 		//menu edit page
 		echo '<a href="index.php?cidReq='.$_course[id].'&action=edit&amp;title='.$page.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('edit').'>'.Display::display_icon('lp_quiz.png',get_lang('EditThisPage')).' '.get_lang('EditPage').'</a>';
-	
+
 		//menu discuss page
 		echo '<a href="index.php?action=discuss&amp;title='.$page.'"'.is_active_navigation_tab('discuss').'>'.Display::display_icon('comment_bubble.gif',get_lang('DiscussThisPage')).' '.get_lang('Discuss').'</a>';
  	}
@@ -589,7 +589,7 @@ if ($_GET['action']=='mactiveusers')
 	if (mysql_num_rows($allpages) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($allpages))
+		while ($obj = Database::fetch_object($allpages))
 		{
 			$userinfo=Database::get_user_info_from_id($obj->user_id);
 			$row = array ();
@@ -632,7 +632,7 @@ if ($_GET['action']=='usercontrib')
 	if (mysql_num_rows($allpages) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($allpages))
+		while ($obj = Database::fetch_object($allpages))
 		{
 			//get author
 			$userinfo=Database::get_user_info_from_id($obj->user_id);
@@ -719,7 +719,7 @@ if ($_GET['action']=='mostchanged')
 	if (mysql_num_rows($allpages) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($allpages))
+		while ($obj = Database::fetch_object($allpages))
 		{
 			//get type assignment icon
 			if($obj->assignment==1)
@@ -773,7 +773,7 @@ if ($_GET['action']=='mvisited')
 	if (mysql_num_rows($allpages) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($allpages))
+		while ($obj = Database::fetch_object($allpages))
 		{
 			//get type assignment icon
 			if($obj->assignment==1)
@@ -1126,7 +1126,7 @@ if ($_GET['action']=='links')
 		if (mysql_num_rows($allpages) > 0)
 		{
 			$row = array ();
-			while ($obj = mysql_fetch_object($allpages))
+			while ($obj = Database::fetch_object($allpages))
 			{
 				//get author
 				$userinfo=Database::get_user_info_from_id($obj->user_id);
@@ -1179,7 +1179,7 @@ if ($_GET['action']=='links')
 // Display the form for adding a new wiki page
 if ($_GET['action']=='addnew')
 {
-	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {		 
+	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 		api_not_allowed();
 	}
 
@@ -1244,10 +1244,10 @@ if ($_GET['action']=='showpage' AND !isset($_POST['SaveWikiNew']))
 
 if ($_GET['action']=='edit')
 {
-	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {		 
+	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 		api_not_allowed();
 	}
-	
+
 	$_clean['group_id']=(int)$_SESSION['_gid'];
 
 	$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$tbl_wiki.'.'.$groupfilter.$condition_session.' ORDER BY id DESC';
@@ -1898,10 +1898,10 @@ if ($_GET['action']=='recentchanges')
 			$notify_all= '<a href="index.php?action=recentchanges&amp;actionpage=notify_all&amp;title='.$page.'"><img src="../img/wiki/send_mail_checked.gif" title="'.get_lang('FullNotifyByEmail').'" alt="'.get_lang('FullNotifyByEmail').'" style="vertical-align:middle;" />'.get_lang('NotNotifyChanges').'</a>';
 		}
 		else
-		{	 
+		{
 			$notify_all= '<a href="index.php?action=recentchanges&amp;actionpage=notify_all&amp;title='.$page.'"><img src="../img/wiki/send_mail.gif" title="'.get_lang('FullCancelNotifyByEmail').'" alt="'.get_lang('FullCancelNotifyByEmail').'"  style="vertical-align:middle;"/>'.get_lang('NotifyChanges').'</a>';
-		}	
-		
+		}
+
 	}
 
 	echo '<div class="actions"><span style="float: right;">'.$notify_all.'</span>'.get_lang('RecentChanges').'</div>';
@@ -1928,7 +1928,7 @@ if ($_GET['action']=='recentchanges')
 	if (mysql_num_rows($allpages) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($allpages))
+		while ($obj = Database::fetch_object($allpages))
 		{
 			//get author
 			$userinfo=Database::get_user_info_from_id($obj->user_id);
@@ -2018,7 +2018,7 @@ if ($_GET['action']=='allpages')
 	if (mysql_num_rows($allpages) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($allpages))
+		while ($obj = Database::fetch_object($allpages))
 		{
 			//get author
 			$userinfo=Database::get_user_info_from_id($obj->user_id);
@@ -2087,7 +2087,7 @@ if ($_GET['action']=='allpages')
 
 if ($_GET['action']=='discuss')
 {
-	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {		 
+	if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
 		api_not_allowed();
 	}
 
@@ -2134,11 +2134,11 @@ if ($_GET['action']=='discuss')
 			if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 			{
 				if (check_addlock_discuss()==1)
-				{				
+				{
 					$addlock_disc= '<img src="../img/wiki/unlock.gif" title="'.get_lang('UnlockDiscussExtra').'" alt="'.get_lang('UnlockDiscussExtra').'" />';
 					$lock_unlock_disc='unlockdisc';
 				}
-				
+
 				else
 				{
 					$addlock_disc= '<img src="../img/wiki/lock.gif" title="'.get_lang('LockDiscussExtra').'" alt="'.get_lang('LockDiscussExtra').'" />';
@@ -2147,11 +2147,11 @@ if ($_GET['action']=='discuss')
 			}
 			echo '<span style="float:right">';
 			echo '<a href="index.php?action=discuss&amp;actionpage='.$lock_unlock_disc.'&amp;title='.$page.'">'.$addlock_disc.'</a>';
-			echo '</span>';	
+			echo '</span>';
 
 			// discussion action: visibility.  Show discussion to students if isn't hidden. Show page to all teachers if is hidden.
-			
-			
+
+
 			if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 			{
 				if (check_visibility_discuss()==1)
@@ -2160,15 +2160,15 @@ if ($_GET['action']=='discuss')
 					//if(($row['assignment']==2 && $row['visibility_disc']==0 && (api_get_user_id()==$row['user_id']))==false)
 					//{
 						//$visibility_disc= '<img src="../img/wiki/invisible.gif" title="'.get_lang('HideDiscussExtra').'" alt="'.get_lang('HideDiscussExtra').'" />';
-			
-					//}					
+
+					//}
 					$visibility_disc= '<img src="../img/wiki/visible.gif" title="'.get_lang('ShowDiscussExtra').'" alt="'.get_lang('ShowDiscussExtra').'" />';
 					$hide_show_disc='hidedisc';
 				}
 				else
 				{
 					$visibility_disc= '<img src="../img/wiki/invisible.gif" title="'.get_lang('HideDiscussExtra').'" alt="'.get_lang('HideDiscussExtra').'" />';
-					$hide_show_disc='showdisc';					
+					$hide_show_disc='showdisc';
 				}
 			}
 			echo '<span style="float:right">';
@@ -2176,7 +2176,7 @@ if ($_GET['action']=='discuss')
 			echo '</span>';
 
 			//discussion action: check add rating lock. Show/Hide list to rating for all student
-			
+
 			if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 			{
 				if (check_ratinglock_discuss()==1)
@@ -2187,7 +2187,7 @@ if ($_GET['action']=='discuss')
 				else
 				{
 					$ratinglock_disc= '<img src="../img/wiki/rating_na.gif" title="'.get_lang('LockRatingDiscussExtra').'" alt="'.get_lang('LockRatingDiscussExtra').'" />';
-					$lock_unlock_rating_disc='lockrating';	
+					$lock_unlock_rating_disc='lockrating';
 				}
 			}
 

+ 23 - 23
main/wiki/wiki.inc.php

@@ -303,7 +303,7 @@ function save_wiki() {
 	$_clean['version']=Database::escape_string($_POST['version'])+1;
 	$_clean['linksto'] = links_to($_clean['content']); //and check links content
 	$dtime = date( "Y-m-d H:i:s" );
-	$session_id = api_get_session_id();	
+	$session_id = api_get_session_id();
 
 	if (isset($_SESSION['_gid']))
     {
@@ -405,7 +405,7 @@ function restore_wikipage($r_page_id, $r_reflink, $r_title, $r_content, $r_group
 	$r_version = $r_version+1;
 	$r_comment = get_lang('RestoredFromVersion').': '.$c_version;
 	$session_id = api_get_session_id();
-	
+
 	$sql="INSERT INTO ".$tbl_wiki." (page_id, reflink, title, content, user_id, group_id, dtime, assignment, comment, progress, version, linksto, user_ip, session_id) VALUES ('".$r_page_id."','".$r_reflink."','".$r_title."','".$r_content."','".$r_user_id."','".$r_group_id."','".$r_dtime."','".$r_assignment."','".$r_comment."','".$r_progress."','".$r_version."','".$r_linksto."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."','".Database::escape_string($session_id)."')";
 
 	$result=Database::query($sql);
@@ -549,7 +549,7 @@ function save_new_wiki() {
 			$sql = "INSERT INTO ".$tbl_wiki." (reflink, title, content, user_id, group_id, dtime, visibility, visibility_disc, ratinglock_disc, assignment, comment, progress, version, linksto, user_ip, session_id) VALUES ('".$_clean['reflink']."','".$_clean['title']."','".$_clean['content']."','".$_clean['user_id']."','".$_clean['group_id']."','".$dtime."','".$_clean['visibility']."','".$_clean['visibility_disc']."','".$_clean['ratinglock_disc']."','".$_clean['assignment']."','".$_clean['comment']."','".$_clean['progress']."','".$_clean['version']."','".$_clean['linksto']."','".Database::escape_string($_SERVER['REMOTE_ADDR'])."', '".Database::escape_string($session_id)."')";
 		    $result = Database::query($sql,__LINE__,__FILE__);
 		    $Id = Database::insert_id();
-		   	
+
 		   	if ($Id > 0) {
 				//insert into item_property
 				api_item_property_update(api_get_course_info(), TOOL_WIKI, $Id, 'WikiAdded', api_get_user_id(), $_clean['group_id']);
@@ -560,7 +560,7 @@ function save_new_wiki() {
 
 			//insert wiki config
 		   $sql="INSERT INTO ".$tbl_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3, max_text, max_version, startdate_assig, enddate_assig, delayedsubmit) VALUES ('".$Id."','".$_clean['task']."','".$_clean['feedback1']."','".$_clean['feedback2']."','".$_clean['feedback3']."','".$_clean['fprogress1']."','".$_clean['fprogress2']."','".$_clean['fprogress3']."','".$_clean['max_text']."','".$_clean['max_version']."','".$_clean['startdate_assig']."','".$_clean['enddate_assig']."','".$_clean['delayedsubmit']."')";
-		   Database::query($sql,__LINE__,__FILE__);		   
+		   Database::query($sql,__LINE__,__FILE__);
 
 		   check_emailcue(0, 'A');
 		   return get_lang('NewWikiSaved').' <a href="index.php?action=showpage&amp;title='.$_clean['reflink'].'&group_id='.$group_id.'">'.$_POST['title'].'</a>';
@@ -838,11 +838,11 @@ function display_wiki_entry()
 	{
 		echo '<div id="wikititle">';
 
-		// page action: protecting (locking) the page		
+		// page action: protecting (locking) the page
 		if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 		{
 			if (check_protect_page()==1)
-			{				
+			{
 				$protect_page= '<img src="../img/wiki/lock.gif" title="'.get_lang('PageLockedExtra').'" alt="'.get_lang('PageLockedExtra').'" />';
 				$lock_unlock_protect='unlock';
 			}
@@ -864,11 +864,11 @@ function display_wiki_entry()
 				// TODO: FIX  This hides the icon eye closed to users of work they can see yours
 				//if(($row['assignment']==2 && $KeyVisibility=="0" && (api_get_user_id()==$row['user_id']))==false)
 				//{
-				//		
+				//
 				// }
 				$visibility_page= '<img src="../img/wiki/visible.gif" title="'.get_lang('ShowPageExtra').'" alt="'.get_lang('ShowPageExtra').'" />';
 				$lock_unlock_visibility='invisible';
-									
+
 			}
 			else
 			{
@@ -1068,8 +1068,8 @@ function check_addnewpagelock()
 	//change status
 	if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
-		
-		if ($_GET['actionpage']=='lockaddnew' && $status_addlock==0) 
+
+		if ($_GET['actionpage']=='lockaddnew' && $status_addlock==0)
 		{
 	    	$status_addlock=1;
 			}
@@ -1117,13 +1117,13 @@ function check_protect_page()
 	{
 		if($_GET['actionpage']=='lock' && $status_editlock==0)
 		{
-			$status_editlock=1;			
+			$status_editlock=1;
 		}
 		if($_GET['actionpage']=='unlock' && $status_editlock==1)
 		{
 			$status_editlock=0;
-		}	
-	
+		}
+
 
 		$sql='UPDATE '.$tbl_wiki.' SET editlock="'.Database::escape_string($status_editlock).'" WHERE id="'.$id.'"';
 	    Database::query($sql,__FILE__,__LINE__);
@@ -1162,14 +1162,14 @@ function check_visibility_page()
 	$status_visibility=$row['visibility'];
 
 
-	//change status	
-	
+	//change status
+
 	if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
 		if($_GET['actionpage']=='visible' && $status_visibility==0)
 		{
 			$status_visibility=1;
-			
+
 		}
 		if($_GET['actionpage']=='invisible' && $status_visibility==1)
 		{
@@ -1210,7 +1210,7 @@ function check_visibility_discuss()
 	$row=Database::fetch_array($result);
 
 	$status_visibility_disc=$row['visibility_disc'];
-	
+
 	//change status
 	if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
@@ -1260,8 +1260,8 @@ function check_addlock_discuss()
 	//change status
 	if (api_is_allowed_to_edit() || api_is_platform_admin())
     {
-		
-		if ($_GET['actionpage']=='lockdisc' && $status_addlock_disc==0) 
+
+		if ($_GET['actionpage']=='lockdisc' && $status_addlock_disc==0)
 		{
 	    	$status_addlock_disc=1;
 			}
@@ -1309,14 +1309,14 @@ function check_ratinglock_discuss()
 	//change status
 	if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
     {
-		if ($_GET['actionpage']=='lockrating' && $status_ratinglock_disc==0) 
+		if ($_GET['actionpage']=='lockrating' && $status_ratinglock_disc==0)
 		{
 	    	$status_ratinglock_disc=1;
 		}
 		if ($_GET['actionpage']=='unlockrating' && $status_ratinglock_disc==1)
 		{
 			$status_ratinglock_disc=0;
-		}	
+		}
 
 		$sql='UPDATE '.$tbl_wiki.' SET ratinglock_disc="'.Database::escape_string($status_ratinglock_disc).'" WHERE reflink="'.html_entity_decode(Database::escape_string(stripslashes(urldecode($page)))).'" AND '.$groupfilter; //Visibility. Value to all,not only for the first
 	    Database::query($sql,__FILE__,__LINE__);
@@ -1337,7 +1337,7 @@ function check_ratinglock_discuss()
 /**
  * Notify page changes
  * @author Juan Carlos Raña <herodoto@telefonica.net>
- * return the current 
+ * return the current
  */
 
 function check_notify_page($reflink)
@@ -1975,7 +1975,7 @@ function display_wiki_search_results($search_term, $search_content=0)
 	if (mysql_num_rows($result) > 0)
 	{
 		$row = array ();
-		while ($obj = mysql_fetch_object($result))
+		while ($obj = Database::fetch_object($result))
 		{
 			//get author
 			$userinfo=Database::get_user_info_from_id($obj->user_id);

+ 1 - 1
tests/main/inc/lib/surveymanager.lib.test.php

@@ -182,7 +182,7 @@ class TestSurveyManager extends UnitTestCase {
 		$table_user = Database::get_main_table(TABLE_MAIN_USER);
 		$sqlm = "SELECT  status FROM  $table_user WHERE user_id = '".mysql_real_escape_string($_user['user_id'])."'";
 		$resm = Database::query($sqlm,__FILE__,__LINE__);
-		$objm=@mysql_fetch_object($resm);
+		$objm=@Database::fetch_object($resm);
 		$ss = $objm->status ;
 		$res=SurveyManager::get_status();
 		$this->assertTrue(is_string($res));