Ver Fonte

Feature #5397 - Replacing mysql_query() with Database::query().

Ivan Tcholakov há 15 anos atrás
pai
commit
f10a1a6e3d

+ 1 - 1
main/exercice/mark_free_answer.php

@@ -182,7 +182,7 @@ if($action == 'mark'){
 				$res = Database::query($sql,__FILE__,__LINE__);
 				$my_msg = get_lang('MarkInserted');
 			}
-			//$mysql_query($sql);
+			//$Database::query($sql, __FILE__, __LINE__);
 			//return 0;
 		}
 	}else{

+ 8 - 4
main/inc/lib/blog.lib.php

@@ -2384,9 +2384,10 @@ class Blog {
 			ON user.user_id = blogs_rel_user.user_id
 			WHERE blogs_rel_user.blog_id = '".(int)$blog_id."'";
 
-		//$sql_result = Database::query($sql_query, __FILE__, __LINE__);
-
-		$sql_result = mysql_query($sql_query) or die(mysql_error());
+		//$sql_result = mysql_query($sql_query) or die(mysql_error());
+		if (!($sql_result = Database::query($sql_query, __FILE__, __LINE__))) {
+			die();
+		}
 
 		$user_data = array ();
 
@@ -2408,7 +2409,10 @@ class Blog {
 			INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt ON btu.task_id = bt.task_id
 			WHERE btu.blog_id = $blog_id AND btu.user_id = " . $myrow['user_id'] . "";
 
-			$sql_res = mysql_query($sql) or die(mysql_error());
+			//$sql_res = mysql_query($sql) or die(mysql_error());
+			if (!($sql_res = Database::query($sql, __FILE__, __LINE__))) {
+				die();
+			}
 
 			$task = '';
 

+ 4 - 4
main/inc/lib/main_api.lib.php

@@ -2396,19 +2396,19 @@ function api_item_property_update($_course, $tool, $item_id, $lastedit_type, $us
 										WHERE $filter";
 	}
 
-	$res = mysql_query($sql);
+	$res = Database::query($sql, __FILE__, __LINE__);
 	// insert if no entries are found (can only happen in case of $lastedit_type switch is 'default')
 	if (Database::affected_rows() == 0) {
 
 		$sql = "INSERT INTO $TABLE_ITEMPROPERTY
 						   		  			(tool,ref,insert_date,insert_user_id,lastedit_date,lastedit_type,   lastedit_user_id,$to_field,  visibility,   start_visible,   end_visible, id_session)
 						         	VALUES 	('$tool','$item_id','$time',    '$user_id',	   '$time',		 '$lastedit_type','$user_id',	   '$to_value','$visibility','$start_visible','$end_visible', '$session_id')";
-		$res = mysql_query($sql);
+		$res = Database::query($sql, __FILE__, __LINE__);
 		if (!$res) {
-			return FALSE;
+			return false;
 		}
 	}
-	return TRUE;
+	return true;
 }
 
 /*

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

@@ -42,7 +42,7 @@ class SurveyManager {
 		$survey_table = Database :: get_course_table(TABLE_SURVEY);
 		$sql = "SELECT * FROM $survey_table";// WHERE is_shared='1'";
 		$sql_result = Database::query($sql,__FILE__,__LINE__);
-		if(mysql_num_rows($sql_result)>0)
+		if (Database::num_rows($sql_result) > 0)
 		{
 			$str_survey_list = "";
 			$str_survey_list .= "<select name=\"exiztingsurvey\" $extra_script>\n";
@@ -86,7 +86,7 @@ class SurveyManager {
 
 		$sql_query = "SELECT * FROM $table_group WHERE groupname='".Database::escape_string($group_title)."' AND survey_id=".Database::escape_string($survey_id);
 		$res = Database::query($sql_query, __FILE__, __LINE__);
-		if(mysql_num_rows($res))
+		if (Database::num_rows($res))
 		{
 			return false;
 
@@ -99,7 +99,7 @@ class SurveyManager {
 			list($sortby) = Database::fetch_array($rs);
 			$sortby++;
 			$sql="INSERT INTO $table_group(group_id,survey_id,groupname,introduction, sortby) values('','$survey_id','$group_title','$introduction','$sortby')";
-			$result=Database::query($sql);
+			$result=Database::query($sql, __FILE__, __LINE__);
 			return Database::insert_id();
 		 }
 
@@ -147,7 +147,7 @@ class SurveyManager {
 		//$grouptable = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
 		$gid = Database::escape_string($gid);
 		$sql = "SELECT * FROM $db_name.survey_group WHERE group_id='$gid'";
-		$res=Database::query($sql);
+		$res=Database::query($sql, __FILE__, __LINE__);
 		$code=@Database::result($res,0,'groupname');
 		return($code);
 	}
@@ -161,7 +161,7 @@ class SurveyManager {
 		$introduction = Database::escape_string($introduction);
 
 		$sql="INSERT INTO $tb (group_id,survey_id,group_title,introduction) values('','$survey_id','$group_title','$introduction')";
-		$result=Database::query($sql);
+		$result=Database::query($sql, __FILE__, __LINE__);
 		return Database::insert_id();
 	}
 	/**
@@ -173,7 +173,7 @@ class SurveyManager {
 		$sql="SELECT code FROM $table_survey where code='$survey_code'";
 		//echo $sql;
 		//exit;
-		$result=Database::query($sql);
+		$result=Database::query($sql, __FILE__, __LINE__);
 		$code=@Database::result($result,0,'code');
 		//echo $code;exit;
 		return($code);
@@ -202,7 +202,7 @@ class SurveyManager {
 			//$table_survey = Database :: get_course_table(TABLE_SURVEY);
 			$sql = "INSERT INTO $table_survey (code,title, subtitle, author,lang,avail_from,avail_till, is_shared,template,intro,surveythanks,creation_date) values('$surveycode','$surveytitle','$surveysubtitle','$author','$survey_language','$availablefrom','$availabletill','$isshare','$surveytemplate','$surveyintroduction','$surveythanks',curdate())";
 			$result = Database::query($sql, __FILE__, __LINE__);
-			//$result = Database::query($sql);
+			//$result = Database::query($sql, __FILE__, __LINE__);
 			$survey_id = Database::insert_id();
 			$sql2 = "INSERT INTO $table_group(group_id,survey_id,groupname,introduction) values('','$survey_id','No Group','This is your Default Group')";
 			$result = Database::query($sql2, __FILE__, __LINE__);
@@ -297,7 +297,7 @@ class SurveyManager {
 
 		$table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION);
 		$sql = "INSERT INTO  $table_question (gid,type,caption,ans1,ans2,ans3,ans4,ans5,ans6,ans7,ans8,ans9,ans10,open_ans,anst,ansd,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10) values('$gid','$type','$caption',$x'$open_ans','$anst','$ansd',$y)";
-		$result = Database::query($sql);
+		$result = Database::query($sql, __FILE__, __LINE__);
 		return Database::insert_id();
 	}
 
@@ -305,7 +305,7 @@ class SurveyManager {
 	{
 		$table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION);
 	  	$sql = "SELECT * FROM $table_question where qid='$questionid'";
-		$res=Database::query($sql);
+		$res=Database::query($sql, __FILE__, __LINE__);
 		$code=@Database::result($res,0,'caption');
 		return($code);
 	}
@@ -316,7 +316,7 @@ class SurveyManager {
 	function create_question($gid,$surveyid,$qtype,$caption,$alignment,$answers,$open_ans,$answerT,$answerD,$rating,$curr_dbname)
 	{
     	$sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
-		$res_sort=Database::query($sql_sort);
+		$res_sort=Database::query($sql_sort, __FILE__, __LINE__);
 		$rs=Database::fetch_object($res_sort);
 		$sortby=$rs->sortby;
 		if(empty($sortby))
@@ -353,7 +353,7 @@ class SurveyManager {
 			$ansd = $answerD;
 		//}
 			$sql = "INSERT INTO $curr_dbname.questions (gid,survey_id,qtype,caption,alignment,sortby,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10) values('$gid','$surveyid','$qtype','$caption','$alignment','$sortby',$x'$anst','$ansd',$y)";
-			$result = Database::query($sql);
+			$result = Database::query($sql, __FILE__, __LINE__);
 			return Database::insert_id();
 
 		}
@@ -371,7 +371,7 @@ class SurveyManager {
 		$anst = $answerT;
 		$ansd = $answerD;
 		$sql = "UPDATE $curr_dbname.questions SET qtype='$qtype',caption='$caption',alignment='$alignment',a1='$answers[0]',a2='$answers[1]',a3='$answers[2]',a4='$answers[3]',a5='$answers[4]',a6='$answers[5]',a7='$answers[6]',a8='$answers[7]',a9='$answers[8]',a10='$answers[9]' WHERE qid='$qid'";
-		$result = Database::query($sql);
+		$result = Database::query($sql, __FILE__, __LINE__);
 		return Database::insert_id();
 	}
 
@@ -383,7 +383,7 @@ class SurveyManager {
 	  $table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION);
 	  $questionid = Database::escape_string($questionid);
 	  $sql = "SELECT * FROM $table_question WHERE qid='$questionid'";
-			$res=Database::query($sql);
+			$res=Database::query($sql, __FILE__, __LINE__);
 			$code=@Database::result($res,0,'type');
 			return($code);
 	 }
@@ -396,8 +396,8 @@ class SurveyManager {
 	  //$table_question = Database :: get_course_table(TABLE_MAIN_SURVEYQUESTION);
 	  $gid = Database::escape_string($gid);
 	  $sql = "SELECT * FROM $db_name.questions WHERE gid='$gid'";
-			$res=Database::query($sql);
-			$code=@mysql_num_rows($res);
+			$res=Database::query($sql, __FILE__, __LINE__);
+			$code=@Database::num_rows($res);
 			return($code);
 	 }
 
@@ -408,7 +408,7 @@ class SurveyManager {
 	{
 			$qid = Database::escape_string($qid);
 	        $sql = "SELECT * FROM $curr_dbname.questions where qid='$qid'";
-			$res=Database::query($sql);
+			$res=Database::query($sql, __FILE__, __LINE__);
 			$rs=Database::fetch_object($res);
 			$properties = get_object_vars($rs);
 			foreach ($properties as $property=>$val){
@@ -424,7 +424,7 @@ class SurveyManager {
 	{
 		global $_course;
 		$sql='SELECT '.$field.' FROM '.$_course['dbName'].'.survey WHERE survey_id='.intval($id);
-		$res=Database::query($sql);
+		$res=Database::query($sql, __FILE__, __LINE__);
 		$code=@Database::result($res,0);
 		return($code);
 
@@ -436,7 +436,7 @@ class SurveyManager {
 	{
 		global $_course;
 		$sql='SELECT * FROM '.$_course['dbName'].'.survey WHERE survey_id='.intval($id);
-		$res=Database::query($sql);
+		$res=Database::query($sql, __FILE__, __LINE__);
 		return Database::fetch_object($res);
 	}
 	/**
@@ -447,7 +447,7 @@ class SurveyManager {
 			//$surveytable=Database:: get_course_table(TABLE_SURVEY);
 			$sid = Database::escape_string($sid);
 			$sql="SELECT * FROM $db_name.survey WHERE survey_id=$sid";
-			$res=Database::query($sql);
+			$res=Database::query($sql, __FILE__, __LINE__);
 			$code=@Database::result($res,0,'title');
 			return($code);
 	}
@@ -459,7 +459,7 @@ class SurveyManager {
 			$sid = Database::escape_string($sid);
 			$surveytable=Database:: get_course_table(TABLE_SURVEY);
 			$sql="SELECT * FROM $surveytable WHERE survey_id=$sid";
-			$res=Database::query($sql);
+			$res=Database::query($sql, __FILE__, __LINE__);
 			$code=@Database::result($res,0,'title');
 			return($code);
 	}
@@ -502,9 +502,9 @@ class SurveyManager {
 			if(isset($selected_group)){
 			 if($selected_group!=''){
 			  $sql = "SELECT $table_group('survey_id', 'groupname') values('$sid', '$groupname')";
-				$res = Database::query($sql);
+				$res = Database::query($sql, __FILE__, __LINE__);
 				$sql = "INSERT INTO $table_group('survey_id', 'groupname') values('$sid', '$groupname')";
-				$res = Database::query($sql);
+				$res = Database::query($sql, __FILE__, __LINE__);
 				$gid_arr[$index]+= Database::insert_id();
 				$groupids=implode(",",$gid_arr);
 			  }
@@ -578,7 +578,7 @@ class SurveyManager {
 	{
 		$ques_table=Database::get_course_table(TABLE_MAIN_SURVEYQUESTION);
 		$sql="SELECT gid FROM $ques_table where qid=$qid";
-		$res=Database::query($sql);
+		$res=Database::query($sql, __FILE__, __LINE__);
 		$id=@Database::result($res,0,'gid');
 		$gname=surveymanager::get_groupname($id);
 		return($gname);
@@ -589,13 +589,13 @@ class SurveyManager {
 	function insert_questions($sid,$newgid,$gid,$table_group)
 	{
 		$sql_select = "SELECT * FROM $table_group WHERE group_id IN (".$gid.")";
-		$res = Database::query($sql_select);
-		$num = mysql_num_rows($res);
+		$res = Database::query($sql_select, __FILE__, __LINE__);
+		$num = Database::num_rows($res);
 		$i=0;
 		while($i<$num)
 		{
 			$sql_insert = "INSERT INTO $table_group(group_id, survey_id, groupname) values('', '$sid', 'Imported Group')";
-			$result = Database::query($sql_insert);
+			$result = Database::query($sql_insert, __FILE__, __LINE__);
 			$i++;
 		}
 	}
@@ -607,7 +607,7 @@ class SurveyManager {
 		$group_table = Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP);
 		$sql = "SELECT * FROM $group_table WHERE survey_id='$survey_id'";
 		$sql_result = Database::query($sql,__FILE__,__LINE__);
-		if(mysql_num_rows($sql_result)>0)
+		if(Database::num_rows($sql_result)>0)
 		{
 			$str_group_list = "";
 			$str_group_list .= "<select name=\"exiztinggroup\" $extra_script>\n";
@@ -641,8 +641,8 @@ class SurveyManager {
 
 
 				$queryone = "SELECT *  FROM $table_question WHERE gid = '$newgid'";
-				$rs = Database::query($queryone);
-				$numrs=mysql_num_rows($rs);
+				$rs = Database::query($queryone, __FILE__, __LINE__);
+				$numrs=Database::num_rows($rs);
 
              for($k=0;$k<$numrs;$k++)
 				{
@@ -680,8 +680,8 @@ class SurveyManager {
 				$temp_gid = $gid_arr[$index];
 
 				$sql = "SELECT * FROM $table_question WHERE gid = '$temp_gid'";
-				$res = Database::query($sql);
-				$num_rows = mysql_num_rows($res);
+				$res = Database::query($sql, __FILE__, __LINE__);
+				$num_rows = Database::num_rows($res);
 				while($obj = Database::fetch_object($res))
 				{
 					$temp_qtype = $obj->qtype;
@@ -710,7 +710,7 @@ class SurveyManager {
 						}
 
 					$sql_insert = "INSERT INTO  $table_question (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$newgid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$temp_gid')";
-					$res2 = Database::query($sql_insert);
+					$res2 = Database::query($sql_insert, __FILE__, __LINE__);
 				}
 
 			}
@@ -728,8 +728,8 @@ class SurveyManager {
 	{
 
 		 $sql = "SELECT group_id FROM $table_group WHERE survey_id='$sid'";
-		$res = Database::query($sql);
-		$num = @mysql_num_rows($res);
+		$res = Database::query($sql, __FILE__, __LINE__);
+		$num = @Database::num_rows($res);
 		//echo "ths is num".$num;
 		$parameters = array();
 		$displays = array();
@@ -738,7 +738,7 @@ class SurveyManager {
 
 			$groupid = $obj->group_id;
 			$query = "SELECT * FROM $table_question WHERE gid = '$groupid'";
-			$result = Database::query($query);
+			$result = Database::query($query, __FILE__, __LINE__);
 		  while($object = @Database::fetch_object($result))
 			{
 				$display = array();
@@ -802,7 +802,7 @@ class SurveyManager {
 			  $r9=addslashes($obj_q->r9);
 			  $r10=addslashes($obj_q->r10);
 		 $sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
-         $res_sort=Database::query($sql_sort);
+         $res_sort=Database::query($sql_sort, __FILE__, __LINE__);
          $rs=Database::fetch_object($res_sort);
 	     $sortby=$rs->sortby;
 	     if(empty($sortby))
@@ -830,18 +830,18 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 	for($p=0;$p<$index;$p++)
 	{
 		$sql = "SELECT * FROM $table_group WHERE group_id = '$gid_arr[$p]'";
-		$res = Database::query($sql);
+		$res = Database::query($sql, __FILE__, __LINE__);
 		$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);
+			$result = Database::query($query, __FILE__, __LINE__);
 			$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);
-			$count_def_check = mysql_num_rows($res_def_check);
+			$res_def_check = Database::query($sql_def_check, __FILE__, __LINE__);
+			$count_def_check = Database::num_rows($res_def_check);
 			for($ctr=0;$ctr<$count_def_check;$ctr++)
 			{
 			 $imp[]=Database::result($res_def_check,$ctr,"imported_group");
@@ -850,8 +850,8 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 			if(!@in_array($gid_arr[$p],$imp))
 			{
 				$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
-				$res_ques = Database::query($sql_ques);
-				$num = mysql_num_rows($res_ques);
+				$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
+				$num = Database::num_rows($res_ques);
 				while($obj_ques = Database::fetch_object($res_ques))
 				{
 					$temp_qtype = $obj_ques->qtype;
@@ -881,7 +881,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 								}
 						}
 					 $sql_ques_insert = "INSERT INTO  $table_question (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$gid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$gid_arr[$p]')";
-					 $res_ques_insert = Database::query($sql_ques_insert);
+					 $res_ques_insert = Database::query($sql_ques_insert, __FILE__, __LINE__);
 				}
 			}
 			else
@@ -893,8 +893,8 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 		{
 			$intro = $obj->introduction;
 			$sql_check = "SELECT * FROM $table_group WHERE survey_id = '$sid'";
-			$res_check = Database::query($sql_check);
-			$num_check = mysql_num_rows($res_check);
+			$res_check = Database::query($sql_check, __FILE__, __LINE__);
+			$num_check = Database::num_rows($res_check);
 			for($k=0;$k<$num_check;$k++)
 				{
                   $imp[]=Database::result($res_check,$k,"imported_group");
@@ -903,11 +903,11 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 			if(!@in_array($gid_arr[$p],$imp))
 			{
 			$sql_insert = "INSERT INTO $table_group(group_id,survey_id,groupname,introduction,imported_group) values('','$sid','$gname','$intro','$gid_arr[$p]')";
-			$res_insert = Database::query($sql_insert);
+			$res_insert = Database::query($sql_insert, __FILE__, __LINE__);
 			$new_gid = Database::insert_id();
 			$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
-			$res_ques = Database::query($sql_ques);
-			$num = mysql_num_rows($res_ques);
+			$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
+			$num = Database::num_rows($res_ques);
 			while($obj_ques = Database::fetch_object($res_ques))
 			{
 				$temp_qtype = $obj_ques->qtype;
@@ -937,7 +937,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 							}
 					}
 				 $sql_ques_insert = "INSERT INTO  $table_question (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$new_gid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$gid_arr[$p]')";
-				 $res_ques_insert = Database::query($sql_ques_insert);
+				 $res_ques_insert = Database::query($sql_ques_insert, __FILE__, __LINE__);
 			}
 		}
 		else
@@ -965,18 +965,18 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 	for($p=0;$p<$index;$p++)
 	{
 		$sql = "SELECT * FROM $db_name.survey_group WHERE group_id = '$gid_arr[$p]'";
-		$res = Database::query($sql);
+		$res = Database::query($sql, __FILE__, __LINE__);
 		$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);
+			$result = Database::query($query, __FILE__, __LINE__);
 			$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);
-			$count_def_check = mysql_num_rows($res_def_check);
+			$res_def_check = Database::query($sql_def_check, __FILE__, __LINE__);
+			$count_def_check = Database::num_rows($res_def_check);
 			for($ctr=0;$ctr<$count_def_check;$ctr++)
 			{
 			 $imp[]=Database::result($res_def_check,$ctr,"imported_group");
@@ -986,8 +986,8 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 			if(!@in_array($gid_arr[$p],$imp))
 			{
 				$sql_ques = "SELECT * FROM $db_name.questions WHERE gid= '$gid_arr[$p]'";
-				$res_ques = Database::query($sql_ques);
-				$num = mysql_num_rows($res_ques);
+				$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
+				$num = Database::num_rows($res_ques);
 				while($obj_ques = Database::fetch_object($res_ques))
 				{
 					$temp_qtype = $obj_ques->qtype;
@@ -1017,7 +1017,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 								}
 						}
 					$sql_ques_insert = "INSERT INTO  $current_db_name.questions (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$gid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$gid_arr[$p]')";
-					 $res_ques_insert = Database::query($sql_ques_insert);
+					$res_ques_insert = Database::query($sql_ques_insert, __FILE__, __LINE__);
 				}
 			}
 			else
@@ -1029,8 +1029,8 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 		{
 			$intro = $obj->introduction;
 			$sql_check = "SELECT * FROM $db_name.survey_group WHERE survey_id = '$sid'";
-			$res_check = Database::query($sql_check);
-			$num_check = mysql_num_rows($res_check);
+			$res_check = Database::query($sql_check, __FILE__, __LINE__);
+			$num_check = Database::num_rows($res_check);
 			for($k=0;$k<$num_check;$k++)
 				{
                   $imp[]=Database::result($res_check,$k,"imported_group");
@@ -1039,11 +1039,11 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 			if(!@in_array($gid_arr[$p],$imp))
 			{
 			$sql_insert = "INSERT INTO $current_db_name.survey_group(group_id,survey_id,groupname,introduction,imported_group) values('','$sid','$gname','$intro','$gid_arr[$p]')";
-			$res_insert = Database::query($sql_insert);
+			$res_insert = Database::query($sql_insert, __FILE__, __LINE__);
 			$new_gid = Database::insert_id();
 			$sql_ques = "SELECT * FROM $db_name.questions WHERE gid= '$gid_arr[$p]'";
-			$res_ques = Database::query($sql_ques);
-			$num = mysql_num_rows($res_ques);
+			$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
+			$num = Database::num_rows($res_ques);
 			while($obj_ques = Database::fetch_object($res_ques))
 			{
 				$temp_qtype = $obj_ques->qtype;
@@ -1073,7 +1073,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 							}
 					}
 				 $sql_ques_insert = "INSERT INTO  $current_db_name.questions (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$new_gid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$gid_arr[$p]')";
-				 $res_ques_insert = Database::query($sql_ques_insert);
+				 $res_ques_insert = Database::query($sql_ques_insert, __FILE__, __LINE__);
 			}
 		}
 		else
@@ -1110,11 +1110,11 @@ function import_question($surveyid,$qids,$table_group,$table_question,$db_name,$
 	 $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);
+	 $num=Database::num_rows($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);
+     $num_ques=Database::num_rows($res_quesid);
  if($num_ques>0)
   {
 	 $message=1;
@@ -1173,11 +1173,11 @@ function import_existing_question($surveyid,$qids,$table_group,$table_question,$
 	 $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);
+	 $num=Database::num_rows($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);
+     $num_ques=Database::num_rows($res_quesid);
  if($num_ques>0)
   {
 	 $message=1;
@@ -1213,18 +1213,18 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 	for($p=0;$p<$index;$p++)
 	{
 		$sql = "SELECT * FROM $table_group WHERE group_id = '$gid_arr[$p]'";
-		$res = Database::query($sql);
+		$res = Database::query($sql, __FILE__, __LINE__);
 		$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);
+			$result = Database::query($query, __FILE__, __LINE__);
 			$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);
-			$count_def_check = mysql_num_rows($res_def_check);
+			$res_def_check = Database::query($sql_def_check, __FILE__, __LINE__);
+			$count_def_check = Database::num_rows($res_def_check);
 			for($ctr=0;$ctr<$count_def_check;$ctr++)
 			{
 			 $imp[]=Database::result($res_def_check,$ctr,"imported_group");
@@ -1233,8 +1233,8 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 			if(!@in_array($gid_arr[$p],$imp))
 			{
 				$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
-				$res_ques = Database::query($sql_ques);
-				$num = mysql_num_rows($res_ques);
+				$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
+				$num = Database::num_rows($res_ques);
 				while($obj_ques = Database::fetch_object($res_ques))
 				{
 					$temp_qtype = $obj_ques->qtype;
@@ -1264,7 +1264,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 								}
 						}
 					 $sql_ques_insert = "INSERT INTO  $table_question (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$gid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$gid_arr[$p]')";
-					 $res_ques_insert = Database::query($sql_ques_insert);
+					 $res_ques_insert = Database::query($sql_ques_insert, __FILE__, __LINE__);
 				}
 			}
 			else
@@ -1276,8 +1276,8 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 		{
 			$intro = $obj->introduction;
 			$sql_check = "SELECT * FROM $table_group WHERE survey_id = '$sid'";
-			$res_check = Database::query($sql_check);
-			$num_check = mysql_num_rows($res_check);
+			$res_check = Database::query($sql_check, __FILE__, __LINE__);
+			$num_check = Database::num_rows($res_check);
 			for($k=0;$k<$num_check;$k++)
 				{
                   $imp[]=Database::result($res_check,$k,"imported_group");
@@ -1286,11 +1286,11 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 			if(!@in_array($gid_arr[$p],$imp))
 			{
 			$sql_insert = "INSERT INTO $table_group(group_id,survey_id,groupname,introduction,imported_group) values('','$sid','$gname','$intro','$gid_arr[$p]')";
-			$res_insert = Database::query($sql_insert);
+			$res_insert = Database::query($sql_insert, __FILE__, __LINE__);
 			$new_gid = Database::insert_id();
 			$sql_ques = "SELECT * FROM $table_question WHERE gid= '$gid_arr[$p]'";
-			$res_ques = Database::query($sql_ques);
-			$num = mysql_num_rows($res_ques);
+			$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
+			$num = Database::num_rows($res_ques);
 			while($obj_ques = Database::fetch_object($res_ques))
 			{
 				$temp_qtype = $obj_ques->qtype;
@@ -1320,7 +1320,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 							}
 					}
 				 $sql_ques_insert = "INSERT INTO  $table_question (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_group) values('','$new_gid','$temp_qtype','$temp_caption',$x'$anst','$ansd',$y,'$gid_arr[$p]')";
-				 $res_ques_insert = Database::query($sql_ques_insert);
+				 $res_ques_insert = Database::query($sql_ques_insert, __FILE__, __LINE__);
 			}
 		}
 		else
@@ -1338,7 +1338,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 		{
 			$surveytable=Database:: get_course_table(TABLE_SURVEY);
 			$sql="SELECT * FROM $surveytable WHERE survey_id=$sid";
-			$res=Database::query($sql);
+			$res=Database::query($sql, __FILE__, __LINE__);
 			$code=@Database::result($res,0,'title');
 			return($code);
 		}
@@ -1363,7 +1363,7 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
   for($i=0; $i<$count; $i++)
    {
 	 $sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
-     $res_sort=Database::query($sql_sort);
+     $res_sort=Database::query($sql_sort, __FILE__, __LINE__);
      $rs=Database::fetch_object($res_sort);
 	 $sortby=$rs->sortby;
 	 if(empty($sortby))
@@ -1402,7 +1402,7 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
 	 //$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__);
-     $num_ques=mysql_num_rows($res_quesid);
+     $num_ques=Database::num_rows($res_quesid);
 	if($num_ques>0)
      {
 	  $message=1;
@@ -1416,7 +1416,7 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
 	  $sql = "SELECT *  FROM $curr_dbname.survey_group WHERE groupname = '$groupname' AND survey_id = '$surveyid'";
 	  $res = Database::query($sql,__FILE__,__LINE__);
       $obj_gro = Database::fetch_object($res);
-	   $num_group=mysql_num_rows($res);
+	   $num_group=Database::num_rows($res);
 	  if($num_group>0)
 	   {
 	   $sql_q_insert = "INSERT INTO $curr_dbname.questions (qid,gid,survey_id,qtype,caption,alignment,sortby,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_question,db_name) values('','$obj_gro->group_id','$surveyid','$obj->qtype','$caption1','$obj->alignment','$sortby','$a1','$a2','$a3','$a4','$a5','$a6','$a7','$a8','$a9','$a10','$at','$ad','$r1','$r2','$r3','$r4','$r5','$r6','$r7','$r8','$r9','$r10','$qid[$i]','$db_name')";
@@ -1450,14 +1450,14 @@ function import_group($surveyid,$gids,$db_name,$curr_dbname)
 		$res_ques = Database::query($sql_ques,__FILE__,__LINE__);
 		$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);
+		$res_check = Database::query($sql_check, __FILE__, __LINE__);
 		$obj_check = Database::fetch_object($res_check);
-		$num = mysql_num_rows($res_check);
+		$num = Database::num_rows($res_check);
 		if($num>0)
 		{
 			$sql_question = "SELECT * FROM $curr_dbname.questions WHERE survey_id='$surveyid' AND imported_question = '$obj_ques->qid' AND db_name = '$db_name'";
 			$res_question = Database::query($sql_question,__FILE__,__LINE__);
-			$num_ques = mysql_num_rows($res_question);
+			$num_ques = Database::num_rows($res_question);
 			if($num_ques>0)
 			{
 				$message=1;
@@ -1465,16 +1465,16 @@ function import_group($surveyid,$gids,$db_name,$curr_dbname)
 	      else
            {
 			$sql_insert_ques =  "INSERT INTO $curr_dbname.questions (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_question,db_name) values('','$obj_check->group_id','$surveyid','$obj_ques->qtype','$obj_ques->caption','$obj_ques->a1','$obj_ques->a2','$obj_ques->a3','$obj_ques->a4','$obj_ques->a5','$obj_ques->a6','$obj_ques->a7','$obj_ques->a8','$obj_ques->a9','$obj_ques->a10','$obj_ques->at','$obj_ques->ad','$obj_ques->r1','$obj_ques->r2','$obj_ques->r3','$obj_ques->r4','$obj_ques->r5','$obj_ques->r6','$obj_ques->r7','$obj_ques->r8','$obj_ques->r9','$obj_ques->r10','$obj_ques->qid','$db_name')";
-			Database::query($sql_insert_ques);
+			Database::query($sql_insert_ques, __FILE__, __LINE__);
 		   }
 		}
 		else
 		 {
 			$insert_group = "INSERT INTO $curr_dbname.survey_group (group_id,survey_id,groupname,introduction,imported_group,db_name) values('','$surveyid','$obj->groupname','$obj->introduction','$obj->group_id','$db_name')";
-			$res_insert_group=Database::query($insert_group);
+			$res_insert_group=Database::query($insert_group, __FILE__, __LINE__);
             $new_gid = Database::insert_id();
 			$sql_insert_grp =  "INSERT INTO $curr_dbname.questions (qid,gid,qtype,caption,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,at,ad,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,imported_question,db_name) values('','$new_gid','$surveyid','$obj_ques->qtype','$obj_ques->caption','$obj_ques->a1','$obj_ques->a2','$obj_ques->a3','$obj_ques->a4','$obj_ques->a5','$obj_ques->a6','$obj_ques->a7','$obj_ques->a8','$obj_ques->a9','$obj_ques->a10','$obj_ques->at','$obj_ques->ad','$obj_ques->r1','$obj_ques->r2','$obj_ques->r3','$obj_ques->r4','$obj_ques->r5','$obj_ques->r6','$obj_ques->r7','$obj_ques->r8','$obj_ques->r9','$obj_ques->r10','$obj_ques->qid','$db_name')";
-			Database::query($sql_insert_grp);
+			Database::query($sql_insert_grp, __FILE__, __LINE__);
 		 }
 	  }
 	return $message;
@@ -1492,23 +1492,23 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 	for($i=0;$i<$index;$i++)
 	{
 		$sql = "SELECT * FROM $db_name.survey_group WHERE group_id = '$gid_arr[$i]'";
-		$res = Database::query($sql);
+		$res = Database::query($sql, __FILE__, __LINE__);
 		$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);
+		$res_curr = Database::query($sql_curr, __FILE__, __LINE__);
 		$obj_curr = Database::fetch_object($res_curr);
 		$gid = $obj_curr->group_id;
-		$num = mysql_num_rows($res_curr);
+		$num = Database::num_rows($res_curr);
 
 		if($num>0) //the group name exists and the questions will be imported in this group.
 		{
 			$sql_ques = "SELECT * FROM $curr_dbname.questions WHERE gid = '$gid'";
-			$res_ques = Database::query($sql_ques);
+			$res_ques = Database::query($sql_ques, __FILE__, __LINE__);
 			$obj_ques = Database::fetch_object($res_ques);
-			$count = mysql_num_rows($res_ques);
+			$count = Database::num_rows($res_ques);
 			for($j=0;$j<$count;$j++)
 			{
 				$check_qid[] = Database::result($res_ques,$j,"imported_question");
@@ -1517,7 +1517,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			$check_qid = @array_unique($check_qid);
 			$check_db = @array_unique($check_db);
 			$sql_old = "SELECT * FROM $db_name.questions WHERE gid = '$gid_arr[$i]'";
-			$res_old = Database::query($sql_old);
+			$res_old = Database::query($sql_old, __FILE__, __LINE__);
 			while($obj_old = Database::fetch_object($res_old))
 			{
 			  $caption1=addslashes($obj_old->caption);
@@ -1544,7 +1544,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			  $r9=addslashes($obj_old->r9);
 			  $r10=addslashes($obj_old->r10);
 				$sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
-                $res_sort=Database::query($sql_sort);
+                $res_sort=Database::query($sql_sort, __FILE__, __LINE__);
                 $rs=Database::fetch_object($res_sort);
 	            $sortby=$rs->sortby;
 	            if(empty($sortby))
@@ -1558,7 +1558,7 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 				else
 				{
 					$sql_insertq = "INSERT INTO $curr_dbname.questions (qid, gid, survey_id, qtype, caption, alignment, sortby, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, at, ad, alt_text, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, imported_question, db_name) VALUES('', '$gid', '$sid', '$obj_old->qtype', '$caption1', '$obj_old->alignment', '$sortby', '$a1', '$a2', '$a3', '$a4', '$a5', '$a6', '$a7', '$a8', '$a9', '$a10', '$at', '$ad', '$alt_text', '$r1', '$r2', '$r3', '$r4', '$r5', '$r6', '$r7', '$r8', '$r9', '$r10', '$obj_old->qid', '$db_name')";
-					Database::query($sql_insertq);
+					Database::query($sql_insertq, __FILE__, __LINE__);
 				}
 			}
 		}
@@ -1566,10 +1566,10 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 		{
 
 			$sql_insertg = "INSERT INTO $curr_dbname.survey_group (group_id, survey_id, groupname, introduction, imported_group, db_name, sortby) VALUES ('', '$sid', '$groupname', '$introduction', '$obj->group_id', '$db_name', $g_sortby)";
-			Database::query($sql_insertg);
+			Database::query($sql_insertg, __FILE__, __LINE__);
 			$group_id = Database::insert_id();
 			$sql_old = "SELECT * FROM $db_name.questions WHERE gid = '$gid_arr[$i]'";
-			$res_old = Database::query($sql_old);
+			$res_old = Database::query($sql_old, __FILE__, __LINE__);
 			while($obj_old = Database::fetch_object($res_old))
 			{
 			  $caption1=addslashes($obj_old->caption);
@@ -1596,14 +1596,14 @@ function import_group($sid,$gids,$db_name,$curr_dbname)
 			  $r9=addslashes($obj_old->r9);
 			  $r10=addslashes($obj_old->r10);
 				$sql_sort = "SELECT max(sortby) AS sortby FROM $curr_dbname.questions ";
-                $res_sort=Database::query($sql_sort);
+                $res_sort=Database::query($sql_sort, __FILE__, __LINE__);
                 $rs=Database::fetch_object($res_sort);
 	            $sortby=$rs->sortby;
 	            if(empty($sortby))
 	            {$sortby=1;}
 	            else{$sortby=$sortby+1;}
 				$sql_insertq = "INSERT INTO $curr_dbname.questions (qid, gid, survey_id, qtype, caption, alignment, sortby, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, at, ad, alt_text, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, imported_question, db_name) VALUES('', '$group_id', '$sid', '$obj_old->qtype', '$caption1', '$obj_old->alignment', '$sortby', '$a1', '$a2', '$a3', '$a4', '$a5', '$a6', '$a7', '$a8', '$a9', '$a10', '$at', '$ad', '$obj_old->alt_text', '$r1', '$r2', '$r3', '$r4', '$r5', '$r6', '$r7', '$r8', '$r9', '$r10', '$obj_old->qid', '$db_name')";
-				Database::query($sql_insertq);
+				Database::query($sql_insertq, __FILE__, __LINE__);
 			}
 		}
 	}
@@ -1656,8 +1656,8 @@ function move_question($direction,$qid,$sort,$curr_dbname)
 		}
 	$sql_update1="UPDATE $curr_dbname.questions SET sortby='".$target_course['sortby']."' WHERE qid='".$source_course['qid']."'";
 	$sql_update2="UPDATE $curr_dbname.questions SET sortby='".$source_course['sortby']."' WHERE qid='".$target_course['qid']."'";
-	mysql_query($sql_update2);
-	mysql_query($sql_update1);
+	Database::query($sql_update2, __FILE__, __LINE__);
+	Database::query($sql_update1, __FILE__, __LINE__);
 	//return ;
 }
 /**
@@ -1666,7 +1666,7 @@ function move_question($direction,$qid,$sort,$curr_dbname)
 function get_questions_move($curr_dbname)
 {
 	$sql_select_questions="SELECT  * from $curr_dbname.questions order by `sortby` asc";
-	$result=mysql_query($sql_select_questions);
+	$result=Database::query($sql_select_questions, __FILE__, __LINE__);
 	while ($row=Database::fetch_array($result))
 		{
 		// we only need the database name of the course