diff --git a/main/dropbox/dropbox_class.inc.php b/main/dropbox/dropbox_class.inc.php
index 8708db794f..1e5237279d 100755
--- a/main/dropbox/dropbox_class.inc.php
+++ b/main/dropbox/dropbox_class.inc.php
@@ -146,7 +146,7 @@ class Dropbox_Work {
 						)";
 
         	$result = Database::query($sql,__FILE__,__LINE__);
-			$this->id = mysql_insert_id(); //get automatically inserted id
+			$this->id = Database::insert_id(); //get automatically inserted id
 		}
 
 		// insert entries into person table
diff --git a/main/exercice/hotspot_savescore.inc.php b/main/exercice/hotspot_savescore.inc.php
index 1ac5a4df24..e23ce53e10 100755
--- a/main/exercice/hotspot_savescore.inc.php
+++ b/main/exercice/hotspot_savescore.inc.php
@@ -54,6 +54,6 @@ $sql = "INSERT INTO $TBL_TRACK_E_HOTSPOT (`user_id` , `course_id` , `quiz_id` ,
 			'".Database::escape_string($coordinates)."')";
 $result = Database::query($sql,__FILE__,__LINE__);
 // Save insert id into session if users changes answer.
-$insert_id = mysql_insert_id();
+$insert_id = Database::insert_id();
 $_SESSION['exerciseResult'][$questionId]['ids'][$answerOrderId] = $insert_id;
 ?>
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index 74578519a9..1e04f2c1e0 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -514,7 +514,7 @@ class Blog {
 					VALUES ('".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
 		Database::query($sql, __FILE__, __LINE__);
 
-		$task_id = mysql_insert_id();
+		$task_id = Database::insert_id();
 		$tool = 'BLOG_' . $blog_id;
 
 		if($articleDelete == 'on')
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 6d58958e2e..09f031cb75 100755
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -1165,7 +1165,7 @@ function add_document($_course,$path,$filetype,$filesize,$title,$comment=NULL, $
 	Database::escape_string(htmlspecialchars($title, ENT_QUOTES, $charset))."', '$comment', $readonly, $session_id)";
 	if(Database::query($sql,__FILE__,__LINE__))
 	{
-		//display_message("Added to database (id ".mysql_insert_id().")!");
+		//display_message("Added to database (id ".Database::insert_id().")!");
 		return Database::insert_id();
 	}
 	else
diff --git a/main/inc/lib/surveymanager.lib.php b/main/inc/lib/surveymanager.lib.php
index cdb29bfe11..140d14abb6 100755
--- a/main/inc/lib/surveymanager.lib.php
+++ b/main/inc/lib/surveymanager.lib.php
@@ -100,7 +100,7 @@ class SurveyManager {
 			$sortby++;
 			$sql="INSERT INTO $table_group(group_id,survey_id,groupname,introduction, sortby) values('','$survey_id','$group_title','$introduction','$sortby')";
 			$result=Database::query($sql);
-			return mysql_insert_id();
+			return Database::insert_id();
 		 }
 
 	}
@@ -162,7 +162,7 @@ class SurveyManager {
 
 		$sql="INSERT INTO $tb (group_id,survey_id,group_title,introduction) values('','$survey_id','$group_title','$introduction')";
 		$result=Database::query($sql);
-		return mysql_insert_id();
+		return Database::insert_id();
 	}
 	/**
 	 * Possible  deprecated method
@@ -203,7 +203,7 @@ class SurveyManager {
 			$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);
-			$survey_id = mysql_insert_id();
+			$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__);
 			return $survey_id;
@@ -233,7 +233,7 @@ class SurveyManager {
 					creation_date = "NOW()"';
 
 		$result = Database::query($sql, __FILE__, __LINE__);
-		$new_survey_id = mysql_insert_id();
+		$new_survey_id = Database::insert_id();
 
 		// copy the groups
 		$groups = self::listGroups($id);
@@ -251,7 +251,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__);
-			$survey_id = mysql_insert_id();
+			$survey_id = Database::insert_id();
 			return $survey_id;
 	}
 	/**
@@ -298,7 +298,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);
-		return mysql_insert_id();
+		return Database::insert_id();
 	}
 
 	function get_question($questionid)
@@ -354,7 +354,7 @@ class SurveyManager {
 		//}
 			$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);
-			return mysql_insert_id();
+			return Database::insert_id();
 
 		}
 
@@ -372,7 +372,7 @@ class SurveyManager {
 		$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);
-		return mysql_insert_id();
+		return Database::insert_id();
 	}
 
 	/**
@@ -505,7 +505,7 @@ class SurveyManager {
 				$res = Database::query($sql);
 				$sql = "INSERT INTO $table_group('survey_id', 'groupname') values('$sid', '$groupname')";
 				$res = Database::query($sql);
-				$gid_arr[$index]+= mysql_insert_id();
+				$gid_arr[$index]+= Database::insert_id();
 				$groupids=implode(",",$gid_arr);
 			  }
 			}
@@ -773,7 +773,7 @@ class SurveyManager {
 		 $introduction=addslashes($obj->introduction);
 	   $sql_insert = "INSERT INTO $curr_dbname.survey_group(group_id,survey_id,groupname,introduction) values('','$newsurveyid','$groupname','$introduction')";
 	   $resnext = Database::query($sql_insert,__FILE__,__LINE__);
-	   $groupid = mysql_insert_id();
+	   $groupid = Database::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 = Database::fetch_object($res_q))
@@ -904,7 +904,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question)
 			{
 			$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);
-			$new_gid = mysql_insert_id();
+			$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);
@@ -1040,7 +1040,7 @@ function insert_old_groups($sid,$gids,$table_group,$table_question,$db_name,$cid
 			{
 			$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);
-			$new_gid = mysql_insert_id();
+			$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);
@@ -1131,7 +1131,7 @@ function import_question($surveyid,$qids,$table_group,$table_question,$db_name,$
   {
 	 $sql_ginsert="INSERT INTO $current_db_name.survey_group(group_id,survey_id,groupname,introduction) values('','$surveyid','$gname','$gintro')";
 	 Database::query($sql_ginsert,__FILE__,__LINE__);
-     $new_gid = mysql_insert_id();
+     $new_gid = Database::insert_id();
 	 $sql_q_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) values('','$new_gid','$obj->qtype','$obj->caption','$obj->a1','$obj->a2','$obj->a3','$obj->a4','$obj->a5','$obj->a6','$obj->a7','$obj->a8','$obj->a9','$obj->a10','$obj->at','$obj->ad','$obj->r1','$obj->r2','$obj->r3','$obj->r4','$obj->r5','$obj->r6','$obj->r7','$obj->r8','$obj->r9','$obj->r10')";
 	 Database::query($sql_q_insert,__FILE__,__LINE__);
     }
@@ -1194,7 +1194,7 @@ function import_existing_question($surveyid,$qids,$table_group,$table_question,$
   {
 	 $sql_ginsert="INSERT INTO $table_group(group_id,survey_id,groupname,introduction) values('','$surveyid','$gname','$gintro')";
 	 Database::query($sql_ginsert,__FILE__,__LINE__);
-     $new_gid = mysql_insert_id();
+     $new_gid = Database::insert_id();
 	 $sql_q_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) values('','$new_gid','$obj->qtype','$obj->caption','$obj->a1','$obj->a2','$obj->a3','$obj->a4','$obj->a5','$obj->a6','$obj->a7','$obj->a8','$obj->a9','$obj->a10','$obj->at','$obj->ad','$obj->r1','$obj->r2','$obj->r3','$obj->r4','$obj->r5','$obj->r6','$obj->r7','$obj->r8','$obj->r9','$obj->r10')";
 	 Database::query($sql_q_insert,__FILE__,__LINE__);
     }
@@ -1287,7 +1287,7 @@ function insert_existing_groups ($sid,$gids,$table_group,$table_question)
 			{
 			$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);
-			$new_gid = mysql_insert_id();
+			$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);
@@ -1427,7 +1427,7 @@ function question_import($surveyid,$qids,$db_name,$curr_dbname)
 		 //$num_group;
       $sql_ginsert="INSERT INTO $curr_dbname.survey_group(group_id,survey_id,groupname,introduction,imported_group, db_name) values('','$surveyid','$groupname','$obj_group->introduction','$oldgid','$db_name')";
 	    Database::query($sql_ginsert,__FILE__,__LINE__);
-        $new_gid = mysql_insert_id();
+        $new_gid = Database::insert_id();
       $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('','$new_gid','$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')";
 	    Database::query($sql_q_insert,__FILE__,__LINE__);
        }
@@ -1472,7 +1472,7 @@ function import_group($surveyid,$gids,$db_name,$curr_dbname)
 		 {
 			$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);
-            $new_gid = mysql_insert_id();
+            $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);
 		 }
@@ -1567,7 +1567,7 @@ 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);
-			$group_id = mysql_insert_id();
+			$group_id = Database::insert_id();
 			$sql_old = "SELECT * FROM $db_name.questions WHERE gid = '$gid_arr[$i]'";
 			$res_old = Database::query($sql_old);
 			while($obj_old = Database::fetch_object($res_old))
diff --git a/main/metadata/md_phpdig.php b/main/metadata/md_phpdig.php
index f36dc2b7bd..64c5c0194a 100755
--- a/main/metadata/md_phpdig.php
+++ b/main/metadata/md_phpdig.php
@@ -84,7 +84,7 @@ function find_site($url)
     {
         $result = Database::query("INSERT INTO " . PHPDIG_DB_PREFIX .
             "sites SET " . $site_url, __FILE__, __LINE__);  // new site
-        $site_id = mysql_insert_id();
+        $site_id = Database::insert_id();
 
         $result = Database::query("INSERT INTO " . PHPDIG_DB_PREFIX .
             "site_page (site_id,num_page) VALUES ('$site_id', '0')");
@@ -136,7 +136,7 @@ function index_words($site_id, $path, $file, $first_words, $keywords)
     Database::query("INSERT INTO " . PHPDIG_DB_PREFIX . $spider_set_path_etc,
         __FILE__, __LINE__);
 
-    $spider_id = mysql_insert_id(); $new = 0;
+    $spider_id = Database::insert_id(); $new = 0;
 
     foreach ($keywords as $key => $w)
     if (strlen($key) > SMALL_WORDS_SIZE and strlen($key) <= MAX_WORDS_SIZE and
@@ -153,7 +153,7 @@ function index_words($site_id, $path, $file, $first_words, $keywords)
                 "keywords (keyword,twoletters) VALUES ('" . addslashes($key) .
                 "','" .addslashes(substr(str_replace('\\','',$key),0,2)) ."')",
             __FILE__, __LINE__);
-            $key_id = mysql_insert_id(); $new++;
+            $key_id = Database::insert_id(); $new++;
         }
         else
         {
diff --git a/main/newscorm/resourcelinker.php b/main/newscorm/resourcelinker.php
index 063ee7712c..0904736cd3 100755
--- a/main/newscorm/resourcelinker.php
+++ b/main/newscorm/resourcelinker.php
@@ -181,7 +181,7 @@ if (!empty ($_POST['external_link_submit']))
 		$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
 		$result = Database::query($sql, __FILE__, __LINE__);
 		$addedresource[] = "Link";
-		$addedresourceid[] = mysql_insert_id();
+		$addedresourceid[] = Database::insert_id();
 		$_SESSION['addedresource'] = $addedresource;
 		$_SESSION['addedresourceid'] = $addedresourceid;
 	}
diff --git a/main/reservation/m_reservation.php b/main/reservation/m_reservation.php
index 2c3ee9af57..0fca151735 100755
--- a/main/reservation/m_reservation.php
+++ b/main/reservation/m_reservation.php
@@ -356,7 +356,7 @@ switch ($_GET['action']) {
 		}
 
 		if($_POST['recurrence_c'] && $msg_number == 0){
-				$Inserted_id = mysql_insert_id();
+				$Inserted_id = Database::insert_id();
 				$recurrence_date_start = Rsys :: mysql_datetime_to_timestamp($values['start']);
 				$recurrence_date_end = Rsys :: mysql_datetime_to_timestamp($values['end']);
 				$recurrence_period_end = Rsys :: mysql_datetime_to_timestamp($values['recurrence_until']);
diff --git a/main/resourcelinker/resourcelinker.php b/main/resourcelinker/resourcelinker.php
index 6b1dcfaf54..b76716f883 100755
--- a/main/resourcelinker/resourcelinker.php
+++ b/main/resourcelinker/resourcelinker.php
@@ -166,7 +166,7 @@ if (!empty ($_POST['external_link_submit']))
 		$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
 		$result = Database::query($sql, __FILE__, __LINE__);
 		$addedresource[] = "Link";
-		$addedresourceid[] = mysql_insert_id();
+		$addedresourceid[] = Database::insert_id();
 		$_SESSION['addedresource'] = $addedresource;
 		$_SESSION['addedresourceid'] = $addedresourceid;
 	}
diff --git a/main/user/user_add.php b/main/user/user_add.php
index e7414cdb18..fabf3355e3 100755
--- a/main/user/user_add.php
+++ b/main/user/user_add.php
@@ -156,7 +156,7 @@ if($register)
 		                           official_code = '$official_code_form',
 		                           creator_id = '".$_user['user_id']."'");
 
-		$userId = mysql_insert_id();
+		$userId = Database::insert_id();
 
 		if ($userId) $platformRegSucceed = true;
 	}