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

Feature #5397 - There are two methods in Database class that do the same thing: Database::get_last_insert_id() and Database::insert_id(). Let us deprecate Database::get_last_insert_id(), it is longer and it doesn't follow the intuitive pattern for replacement mysql_* --> Database::*. Replacing Database::get_last_insert_id() with Database::insert_id().

Browse Source
skala
Ivan Tcholakov 16 years ago
parent ada9c84124
commit e5c9dddad1
30 changed files with 153 additions and 160 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      main/admin/session_import.php
  2. 4
      main/announcements/announcements.inc.php
  3. 4
      main/calendar/agenda.inc.php
  4. 2
      main/course_description/index.php
  5. 48
      main/coursecopy/classes/CourseRestorer.class.php
  6. 6
      main/exercice/exercise.class.php
  7. 4
      main/exercice/question.class.php
  8. 24
      main/forum/forumfunction.inc.php
  9. 2
      main/glossary/index.php
  10. 32
      main/inc/lib/add_course.lib.inc.php
  11. 14
      main/inc/lib/blog.lib.php
  12. 2
      main/inc/lib/course.lib.php
  13. 24
      main/inc/lib/database.lib.php
  14. 2
      main/inc/lib/events.lib.inc.php
  15. 6
      main/inc/lib/sessionmanager.lib.php
  16. 4
      main/inc/lib/specific_fields_manager.lib.php
  17. 4
      main/inc/lib/usermanager.lib.php
  18. 16
      main/install/update-db-scorm-1.6.x-1.8.0.inc.php
  19. 4
      main/newscorm/aicc.class.php
  20. 40
      main/newscorm/learnpath.class.php
  21. 4
      main/newscorm/learnpathItem.class.php
  22. 4
      main/newscorm/learnpath_functions.inc.php
  23. 6
      main/newscorm/resourcelinker.php
  24. 4
      main/newscorm/scorm.class.php
  25. 2
      main/newscorm/scorm_admin.php
  26. 18
      main/notebook/index.php
  27. 4
      main/reservation/rsys.php
  28. 12
      main/webservices/registration.soap.php
  29. 5
      tests/main/inc/lib/database.lib.test.php
  30. 4
      tests/main/inc/lib/sessionmanager.lib.test.php

8
main/admin/session_import.php
Unescape View File

@ -113,7 +113,7 @@ if ($_POST['formSent']) {
// When it is applicable, adding the access_url rel user relationship too.
Database::query($sql, __FILE__, __LINE__);
$return = Database::get_last_insert_id();
$return = Database::insert_id();
global $_configuration;
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls']) {
@ -313,7 +313,7 @@ if ($_POST['formSent']) {
date_end = '$date_end',
session_admin_id=".intval($_user['user_id']);
$rs_session = Database::query($sql_session, __FILE__, __LINE__);
$session_id = Database::get_last_insert_id();
$session_id = Database::insert_id();
$session_counter++;
} else {
@ -328,7 +328,7 @@ if ($_POST['formSent']) {
date_end = '$date_end',
session_admin_id=".intval($_user['user_id']);
$rs_session = Database::query($sql_session, __FILE__, __LINE__);
$session_id = Database::get_last_insert_id();
$session_id = Database::insert_id();
$session_counter++;
} else {
// if the session already exists - update it.
@ -573,7 +573,7 @@ if ($_POST['formSent']) {
date_end = '$date_end',
session_admin_id=".intval($_user['user_id']);
$rs_session = Database::query($sql_session, __FILE__, __LINE__);
$session_id = Database::get_last_insert_id();
$session_id = Database::insert_id();
$session_counter++;
} else {
$my_session_result = SessionManager::get_session_by_name($session_name);

4
main/announcements/announcements.inc.php
Unescape View File

@ -754,7 +754,7 @@ function store_advalvas_item($emailTitle,$newContent, $order, $to)
// store in the table announcement
$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".intval($_SESSION['id_session']);
$result = Database::query($sql,__FILE__,__LINE__) or die (mysql_error());
$last_id= Database::get_last_insert_id();
$last_id= Database::insert_id();
// store in item_property (first the groups, then the users
if (!is_null($to)) // !is_null($to): when no user is selected we send it to everyone
@ -804,7 +804,7 @@ function store_advalvas_group_item($emailTitle,$newContent, $order, $to, $to_use
// store in the table announcement
$sql = "INSERT INTO $tbl_announcement SET content = '$newContent', title = '$emailTitle', end_date = NOW(), display_order ='$order', session_id=".intval($_SESSION['id_session']);
$result = Database::query($sql,__FILE__,__LINE__) or die (mysql_error());
$last_id= Database::get_last_insert_id();
$last_id= Database::insert_id();
// store in item_property (first the groups, then the users
if (!isset($to_users)) // !isset($to): when no user is selected we send it to everyone

4
main/calendar/agenda.inc.php
Unescape View File

@ -1063,7 +1063,7 @@ function store_agenda_item_as_announcement($item_id){
$res_ins = Database::query($sql_ins,__FILE__,__LINE__);
if($res > 0)
{
$ann_id = Database::get_last_insert_id();
$ann_id = Database::insert_id();
//Now also get the list of item_properties rows for this agenda_item (calendar_event)
//and copy them into announcement item_properties
$table_props = Database::get_course_table(TABLE_ITEM_PROPERTY);
@ -1792,7 +1792,7 @@ function display_agenda_items()
$session_id = api_get_session_id();
$session_condition = api_get_session_condition($session_id);
if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))
{
// A.1. you are a course admin with a USER filter

2
main/course_description/index.php
Unescape View File

@ -229,7 +229,7 @@ if (api_is_allowed_to_edit(null,true) && !is_null($description_id) || $action ==
$sql = "INSERT INTO $tbl_course_description SET id = '".$description_id."', title = '".Database::escape_string(Security::remove_XSS($title,COURSEMANAGERLOWSECURITY))."', content = '".Database::escape_string(Security::remove_XSS($content,COURSEMANAGERLOWSECURITY))."', session_id = ".intval($session_id)." ";
Database::query($sql, __FILE__, __LINE__);
}
$id = Database::get_last_insert_id();
$id = Database::insert_id();
if ($id > 0) {
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_COURSE_DESCRIPTION, $id, 'CourseDescriptionAdded', api_get_user_id());

48
main/coursecopy/classes/CourseRestorer.class.php
Unescape View File

@ -316,20 +316,20 @@ class CourseRestorer
$sql = "INSERT INTO $table SET path = '$path_title', comment = '".Database::escape_string($document->comment)."', title = '".Database::escape_string(basename($path_title))."' ,filetype='".$document->file_type."', size= '".$document->size."', session_id = '$session_id'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::insert_id();
} else {
copy($path.$document->path, $path.$new_file_name);
$sql = "INSERT INTO ".$table." SET path = '/".Database::escape_string(substr($new_file_name, 9))."', comment = '".Database::escape_string($document->comment)."', title = '".Database::escape_string($document->title)."' ,filetype='".$document->file_type."', size= '".$document->size."', session_id = '$session_id'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::insert_id();
}
} else {
copy($this->course->backup_path.'/'.$document->path, $path.$new_file_name);
$sql = "INSERT INTO ".$table." SET path = '/".Database::escape_string(substr($new_file_name, 9))."', comment = '".Database::escape_string($document->comment)."', title = '".Database::escape_string($document->title)."' ,filetype='".$document->file_type."', size= '".$document->size."'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::insert_id();
}
break;
@ -344,7 +344,7 @@ class CourseRestorer
copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
$sql = "INSERT INTO ".$table." SET path = '/".substr($document->path, 9)."', comment = '".Database::escape_string($document->comment)."', title = '".Database::escape_string($document->title)."' ,filetype='".$document->file_type."', size= '".$document->size."'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::insert_id();
}
else
{
@ -376,7 +376,7 @@ class CourseRestorer
{
$sql = "INSERT INTO ".$table." SET path = '/".Database::escape_string(substr($document->path, 9))."', comment = '".Database::escape_string($document->comment)."', title = '".Database::escape_string($document->title)."' ,filetype='".$document->file_type."', size= '".$document->size."'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = Database::insert_id();
}*/
} // end folder
} // end for each
@ -495,7 +495,7 @@ class CourseRestorer
", session_id = ".(int)Database::escape_string($forum->session_id).
", forum_image = '".Database::escape_string($forum->image)."'";
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
$forum_topics = 0;
if (is_array($this->course->resources[RESOURCE_FORUMTOPIC]))
@ -543,7 +543,7 @@ class CourseRestorer
", locked = ".(int)Database::escape_string($forum_cat->locked).
", session_id = ".(int)Database::escape_string($forum_cat->session_id);
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_FORUMCATEGORY][$id]->destination_id = $new_id;
return $new_id;
}
@ -571,7 +571,7 @@ class CourseRestorer
", thread_title_qualify = '".Database::escape_string($topic->title_qualify).
"', thread_qualify_max = ".(float)Database::escape_string($topic->qualify_max);
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_FORUMTOPIC][$id]->destination_id = $new_id;
$topic_replies = -1;
foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post)
@ -616,7 +616,7 @@ class CourseRestorer
", post_parent_id = ".(int)Database::escape_string($post->parent_post_id).
", visible = ".(int)Database::escape_string($post->visible);
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
return $new_id;
}
@ -644,7 +644,7 @@ class CourseRestorer
$sql = "INSERT INTO ".$link_table." SET url = '".Database::escape_string($link->url)."', title = '".Database::escape_string($link->title)."', description = '".Database::escape_string($link->description)."', category_id='".$cat_id."', on_homepage = '".$link->on_homepage."', display_order='".($max_order+1)."' $condition_session";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_LINK][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_LINK][$id]->destination_id = Database::insert_id();
}
}
}
@ -665,7 +665,7 @@ class CourseRestorer
$sql = "INSERT INTO ".$tool_intro_table." SET id='".Database::escape_string($tool_intro->id)."', intro_text = '".Database::escape_string($tool_intro->intro_text)."'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = Database::insert_id();
}
}
}
@ -693,7 +693,7 @@ class CourseRestorer
$display_order=$orderMax+1;
$sql = "INSERT INTO ".$link_cat_table." SET category_title = '".Database::escape_string($link_cat->title)."', description='".Database::escape_string($link_cat->description)."', display_order='".$display_order."' $condition_session ";
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_LINKCATEGORY][$id]->destination_id = $new_id;
return $new_id;
}
@ -712,7 +712,7 @@ class CourseRestorer
{
$sql = "INSERT INTO ".$table." SET title = '".Database::escape_string($event->title)."', content = '".Database::escape_string($event->content)."', start_date = '".$event->start_date."', end_date = '".$event->end_date."'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_EVENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_EVENT][$id]->destination_id = Database::insert_id();
}
}
}
@ -748,7 +748,7 @@ class CourseRestorer
$sql = "INSERT INTO ".$table." SET title = '".Database::escape_string($cd->title)."', content = '".Database::escape_string($description_content)."' $condition_session";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = Database::insert_id();
}
}
}
@ -770,7 +770,7 @@ class CourseRestorer
"display_order = '".$announcement->display_order."', " .
"email_sent = '".$announcement->email_sent."'";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = Database::insert_id();
}
}
}
@ -823,7 +823,7 @@ class CourseRestorer
"', feedback_type = ".(int)$quiz->feedback_type.
$condition_session;
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
}
else
{
@ -860,7 +860,7 @@ class CourseRestorer
$table_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER, $this->course->destination_db);
$sql = "INSERT INTO ".$table_que." SET question = '".addslashes($question->question)."', description = '".addslashes($question->description)."', ponderation = '".addslashes($question->ponderation)."', position = '".addslashes($question->position)."', type='".addslashes($question->quiz_type)."', picture='".addslashes($question->picture)."', level='".addslashes($question->level)."'";
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
foreach ($question->answers as $index => $answer)
{
$sql = "INSERT INTO ".$table_ans." SET id= '". ($index +1)."',question_id = '".$new_id."', answer = '".Database::escape_string($answer['answer'])."', correct = '".$answer['correct']."', comment = '".Database::escape_string($answer['comment'])."', ponderation='".$answer['ponderation']."', position = '".$answer['position']."', hotspot_coordinates = '".$answer['hotspot_coordinates']."', hotspot_type = '".$answer['hotspot_type']."'";
@ -953,7 +953,7 @@ class CourseRestorer
//Insert the new source survey
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_SURVEY][$id]->destination_id = $new_id;
foreach ($survey->question_ids as $index => $question_id)
{
@ -991,7 +991,7 @@ class CourseRestorer
//Insert the new source survey
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_SURVEY][$id]->destination_id = $new_id;
foreach ($survey->question_ids as $index => $question_id)
{
@ -1018,7 +1018,7 @@ class CourseRestorer
else
{
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
$this->course->resources[RESOURCE_SURVEY][$id]->destination_id = $new_id;
foreach ($survey->question_ids as $index => $question_id)
{
@ -1080,7 +1080,7 @@ class CourseRestorer
"max_value = '".Database::escape_string($question->max_value)."' ";
Database::query($sql, __FILE__, __LINE__);
$new_id = Database::get_last_insert_id();
$new_id = Database::insert_id();
foreach ($question->answers as $index => $answer) {
$sql = "INSERT INTO ".$table_ans." " .
"SET " .
@ -1134,7 +1134,7 @@ class CourseRestorer
"debug= '".Database::escape_string($lp->debug)."' $condition_session ";
Database::query($sql, __FILE__, __LINE__);
$new_lp_id = Database::get_last_insert_id();
$new_lp_id = Database::insert_id();
if($lp->visibility) {
$sql = "INSERT INTO $table_tool SET name='".Database::escape_string($lp->name)."', link='newscorm/lp_controller.php?action=view&lp_id=$new_lp_id', image='scormbuilder.gif', visibility='1', admin='0', address='squaregrey.gif'";
@ -1200,7 +1200,7 @@ class CourseRestorer
"launch_data = '".Database::escape_string($item['launch_dataprereq_type'])."'";
Database::query($sql, __FILE__, __LINE__);
$new_item_id = Database::get_last_insert_id();
$new_item_id = Database::insert_id();
//save a link between old and new item IDs
$new_item_ids[$item['id']] = $new_item_id;
//save a reference of items that need a parent_item_id refresh
@ -1417,7 +1417,7 @@ class CourseRestorer
$sql = "INSERT INTO ".$table_glossary." SET name = '".Database::escape_string($glossary->name)."', description = '".Database::escape_string($glossary->description)."', display_order='".Database::escape_string($glossary->display_order)."' $condition_session ";
Database::query($sql, __FILE__, __LINE__);
$this->course->resources[RESOURCE_GLOSSARY][$id]->destination_id = Database::get_last_insert_id();
$this->course->resources[RESOURCE_GLOSSARY][$id]->destination_id = Database::insert_id();
}
}

6
main/exercice/exercise.class.php
Unescape View File

@ -406,7 +406,7 @@ class Exercise
Database::query($query,__FILE__,__LINE__);*/
$id = add_document($_course,str_replace($documentPath,'',$audioPath).'/'.$this->sound,'file',$sound['size'],$sound['name']);
//$id = Database::get_last_insert_id();
//$id = Database::insert_id();
//$time = time();
//$time = date("Y-m-d H:i:s", $time);
// insert into the item_property table, using default visibility of "visible"
@ -500,7 +500,7 @@ class Exercise
$TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
$TBL_QUIZ_QUESTION= Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
$id = $this->id;
$exercise = $this->exercise;
$description = $this->description;
@ -511,7 +511,7 @@ class Exercise
$random = $this->random;
$active = $this->active;
$session_id = api_get_session_id();
if ($feedbacktype==1){
$results_disabled = 1;
} else {

4
main/exercice/question.class.php
Unescape View File

@ -623,7 +623,7 @@ abstract class Question
)";
Database::query($sql,__FILE__,__LINE__);
$this->id=Database::get_last_insert_id();
$this->id=Database::insert_id();
api_item_property_update($_course, TOOL_QUIZ, $this->id,'QuizQuestionAdded',$_user['user_id']);
@ -905,7 +905,7 @@ abstract class Question
$sql="INSERT INTO $TBL_QUESTIONS(question,description,ponderation,position,type) VALUES('".Database::escape_string($question)."','".Database::escape_string($description)."','".Database::escape_string($weighting)."','".Database::escape_string($position)."','".Database::escape_string($type)."')";
Database::query($sql,__FILE__,__LINE__);
$id=Database::get_last_insert_id();
$id=Database::insert_id();
// duplicates the picture
$this->exportPicture($id);

24
main/forum/forumfunction.inc.php
Unescape View File

@ -496,22 +496,22 @@ function store_forumcategory($values) {
$row=Database::fetch_array($result);
$new_max=$row['sort_max']+1;
$session_id = api_get_session_id();
$clean_cat_title=Database::escape_string(Security::remove_XSS($values['forum_category_title']));
if (isset($values['forum_category_id'])) { // storing an edit
$sql="UPDATE ".$table_categories." SET cat_title='".$clean_cat_title."', cat_comment='".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['forum_category_comment'])),COURSEMANAGERLOWSECURITY))."' WHERE cat_id='".Database::escape_string($values['forum_category_id'])."'";
Database::query($sql,__FILE__,__LINE__);
$last_id=Database::get_last_insert_id();
$last_id=Database::insert_id();
api_item_property_update(api_get_course_info(), TOOL_FORUM_CATEGORY, $values['forum_category_id'], 'ForumCategoryUpdated', api_get_user_id());
$return_message=get_lang('ForumCategoryEdited');
} else {
$sql = "INSERT INTO ".$table_categories." (cat_title, cat_comment, cat_order, session_id) VALUES ('".$clean_cat_title."','".Database::escape_string(Security::remove_XSS(stripslashes(api_html_entity_decode($values['forum_category_comment'])),COURSEMANAGERLOWSECURITY))."','".Database::escape_string($new_max)."','".Database::escape_string($session_id)."')";
Database::query($sql,__FILE__,__LINE__);
$last_id = Database::get_last_insert_id();
$last_id = Database::insert_id();
if ($last_id > 0) {
api_item_property_update(api_get_course_info(), TOOL_FORUM_CATEGORY, $last_id, 'ForumCategoryAdded', api_get_user_id());
}
}
$return_message=get_lang('ForumCategoryAdded');
}
@ -543,9 +543,9 @@ function store_forum($values) {
$new_max=$row['sort_max']+1;
}
$session_id = api_get_session_id();
$clean_title = Database::escape_string(Security::remove_XSS($values['forum_title']));
// forum images
@ -645,7 +645,7 @@ function store_forum($values) {
'".Database::escape_string(isset($new_max)?$new_max:null)."',
".intval($session_id).")";
Database::query($sql,__FILE__,__LINE__);
$last_id = Database::get_last_insert_id();
$last_id = Database::insert_id();
if ($last_id > 0) {
api_item_property_update($_course, TOOL_FORUM, $last_id, 'ForumAdded', api_get_user_id());
}
@ -1104,11 +1104,11 @@ function get_forum_categories($id='') {
$table_categories = Database :: get_course_table(TABLE_FORUM_CATEGORY);
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
$forum_categories_list = array();
//condition for the session
$session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id);
if ($id == '') {
$sql="SELECT * FROM".$table_categories." forum_categories, ".$table_item_property." item_properties
WHERE forum_categories.cat_id=item_properties.ref
@ -1192,11 +1192,11 @@ function get_forums($id='') {
global $table_users;
// **************** GETTING ALL THE FORUMS ************************* //
//condition for the session
$session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id);
$forum_list = array();
if ($id=='') {
//-------------- Student -----------------//
@ -3089,7 +3089,7 @@ function store_move_post($values) {
'".Database::escape_string($current_post['post_date'])."'
)";
$result=Database::query($sql, __FILE__, __LINE__);
$new_thread_id=Database::get_last_insert_id();
$new_thread_id=Database::insert_id();
api_item_property_update($_course, TOOL_FORUM_THREAD, $new_thread_id,"visible", $current_post['poster_id']);
// moving the post to the newly created thread

2
main/glossary/index.php
Unescape View File

@ -162,7 +162,7 @@ function save_glossary($values)
'".Database::escape_string($session_id)."'
)";
$result = Database::query($sql, __FILE__, __LINE__);
$id = Database::get_last_insert_id();
$id = Database::insert_id();
if ($id>0) {
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_GLOSSARY, $id, 'GlossaryAdded', api_get_user_id());

32
main/inc/lib/add_course.lib.inc.php
Unescape View File

@ -2085,31 +2085,31 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
*/
//Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/example_document.html','example_document.html','file','3367')", __FILE__, __LINE__);
//we need to add the document properties too!
//$example_doc_id = Database :: get_last_insert_id();
//$example_doc_id = Database :: insert_id();
//Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,1)", __FILE__, __LINE__);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/images','".get_lang('Images')."','folder','0')", __FILE__, __LINE__);
$example_doc_id = Database :: get_last_insert_id();
$example_doc_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/images/gallery','".get_lang('DefaultCourseImages')."','folder','0')", __FILE__, __LINE__);
$example_doc_id = Database :: get_last_insert_id();
$example_doc_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/shared_folder','".get_lang('SharedDocumentsDirectory')."','folder','0')", __FILE__, __LINE__);
$example_doc_id = Database :: get_last_insert_id();
$example_doc_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/audio','".get_lang('Audio')."','folder','0')", __FILE__, __LINE__);
$example_doc_id = Database :: get_last_insert_id();
$example_doc_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/flash','".get_lang('Flash')."','folder','0')", __FILE__, __LINE__);
$example_doc_id = Database :: get_last_insert_id();
$example_doc_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/video','".get_lang('Video')."','folder','0')", __FILE__, __LINE__);
$example_doc_id = Database :: get_last_insert_id();
$example_doc_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
//FILL THE COURSE DOCUMENT WITH DEFAULT COURSE PICTURES
@ -2144,7 +2144,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
$folder_path=substr($value["dir"],0,strlen($value["dir"])-1);
$temp=explode("/",$folder_path);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('$path_documents".$folder_path."','".$temp[count($temp)-1]."','folder','0')", __FILE__, __LINE__);
$image_id = Database :: get_last_insert_id();
$image_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,0)", __FILE__, __LINE__);
}
@ -2153,7 +2153,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
$temp=explode("/",$value["file"]);
$file_size=filesize($course_documents_folder.$value["file"]);
Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('$path_documents".$value["file"]."','".$temp[count($temp)-1]."','file','$file_size')", __FILE__, __LINE__);
$image_id = Database :: get_last_insert_id();
$image_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,1)", __FILE__, __LINE__);
}
}
@ -2166,7 +2166,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
*/
Database::query("INSERT INTO `".$TABLETOOLAGENDA . "` VALUES ( NULL, '".lang2db(get_lang('AgendaCreationTitle')) . "', '".lang2db(get_lang('AgendaCreationContenu')) . "', now(), now(), NULL, 0)", __FILE__, __LINE__);
//we need to add the item properties too!
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
$sql = "INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_CALENDAR_EVENT . "',1,NOW(),NOW(),$insert_id,'AgendaAdded',1,0,NULL,1)";
Database::query($sql, __FILE__, __LINE__);
@ -2179,7 +2179,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
VALUES ('http://www.google.com','Google','".lang2db(get_lang('Google')) . "','0','0','0','_self')";
Database::query($add_google_link_sql, __FILE__, __LINE__);
//we need to add the item properties too!
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
$sql = "INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_LINK . "',1,NOW(),NOW(),$insert_id,'LinkAdded',1,0,NULL,1)";
Database::query($sql, __FILE__, __LINE__);
@ -2187,7 +2187,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
VALUES ('http://www.wikipedia.org','Wikipedia','".lang2db(get_lang('Wikipedia')) . "','0','1','0','_self')";
Database::query($add_wikipedia_link_sql, __FILE__, __LINE__);
//we need to add the item properties too!
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
$sql = "INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_LINK . "',1,NOW(),NOW(),$insert_id,'LinkAdded',1,0,NULL,1)";
Database::query($sql, __FILE__, __LINE__);
@ -2199,7 +2199,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
$sql = "INSERT INTO `".$TABLETOOLANNOUNCEMENTS . "` (title,content,end_date,display_order,email_sent) VALUES ('".lang2db(get_lang('AnnouncementExampleTitle')) . "', '".lang2db(get_lang('AnnouncementEx')) . "', NOW(), '1','0')";
Database::query($sql, __FILE__, __LINE__);
//we need to add the item properties too!
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
$sql = "INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_ANNOUNCEMENT . "',1,NOW(),NOW(),$insert_id,'AnnouncementAdded',1,0,NULL,1)";
Database::query($sql, __FILE__, __LINE__);
@ -2238,15 +2238,15 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc
-----------------------------------------------------------
*/
Database::query("INSERT INTO `$TABLEFORUMCATEGORIES` VALUES (1,'".lang2db(get_lang('ExampleForumCategory'))."', '', 1, 0, 0)", __FILE__, __LINE__);
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('forum_category',1,NOW(),NOW(),$insert_id,'ForumCategoryAdded',1,0,NULL,1)", __FILE__, __LINE__);
Database::query("INSERT INTO `$TABLEFORUMS` (forum_title, forum_comment, forum_threads,forum_posts,forum_last_post,forum_category, allow_anonymous, allow_edit,allow_attachments, allow_new_threads,default_view,forum_of_group,forum_group_public_private, forum_order,locked,session_id ) VALUES ('".lang2db(get_lang('ExampleForum'))."', '', 0, 0, 0, 1, 0, 1, '0', 1, 'flat','0', 'public', 1, 0,0)", __FILE__, __LINE__);
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_FORUM . "',1,NOW(),NOW(),$insert_id,'ForumAdded',1,0,NULL,1)", __FILE__, __LINE__);
Database::query("INSERT INTO `$TABLEFORUMTHREADS` (thread_id, thread_title, forum_id, thread_replies, thread_poster_id, thread_poster_name, thread_views, thread_last_post, thread_date, locked, thread_qualify_max) VALUES (1, '".lang2db(get_lang('ExampleThread'))."', 1, 0, 1, '', 0, 1, NOW(), 0, 10)", __FILE__, __LINE__);
$insert_id = Database :: get_last_insert_id();
$insert_id = Database :: insert_id();
Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('forum_thread',1,NOW(),NOW(),$insert_id,'ForumThreadAdded',1,0,NULL,1)", __FILE__, __LINE__);
Database::query("INSERT INTO `$TABLEFORUMPOSTS` VALUES (1, '".lang2db(get_lang('ExampleThread'))."', '".lang2db(get_lang('ExampleThreadContent'))."', 1, 1, 1, '', NOW(), 0, 0, 1)", __FILE__, __LINE__);

14
main/inc/lib/blog.lib.php
Unescape View File

@ -129,7 +129,7 @@ class Blog {
public static function create_blog ($title, $subtitle) {
global $_user;
$current_date=date('Y-m-d H:i:s',time());
$session_id = api_get_session_id();
$session_id = api_get_session_id();
// Tabel definitions
$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
@ -145,7 +145,7 @@ class Blog {
$sql = "INSERT INTO $tbl_blogs (blog_name, blog_subtitle, date_creation, visibility, session_id )
VALUES ('".Database::escape_string($title)."', '".Database::escape_string($subtitle)."', '".$current_date."', '1', '$session_id');";
Database::query($sql, __FILE__, __LINE__);
$this_blog_id = Database::get_last_insert_id();
$this_blog_id = Database::insert_id();
if ($this_blog_id > 0) {
//insert into item_property
@ -187,7 +187,7 @@ class Blog {
// Update the blog
$sql = "UPDATE $tbl_blogs SET blog_name = '".Database::escape_string($title)."', blog_subtitle = '".Database::escape_string($subtitle)."' WHERE blog_id ='".Database::escape_string((int)$blog_id)."' LIMIT 1";
Database::query($sql, __FILE__, __LINE__);
$this_blog_id = Database::get_last_insert_id();
$this_blog_id = Database::insert_id();
//update item_property (update)
api_item_property_update(api_get_course_info(), TOOL_BLOGS, Database::escape_string($blog_id), 'BlogUpdated', api_get_user_id());
@ -241,7 +241,7 @@ class Blog {
// Delete from course homepage
$sql = "DELETE FROM $tbl_tool WHERE link = 'blog/blog.php?blog_id=".(int)$blog_id."'";
Database::query($sql, __FILE__, __LINE__);
//update item_property (delete)
api_item_property_update(api_get_course_info(), TOOL_BLOGS, Database::escape_string($blog_id), 'delete', api_get_user_id());
}
@ -2833,11 +2833,11 @@ class Blog {
$counter = 0;
$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
//condition for the session
$session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id, false);
$sql = 'SELECT blog_name,blog_subtitle,visibility,blog_id FROM '.$tbl_blogs.' ORDER BY date_creation DESC ';
$result = Database::query($sql, __FILE__, __LINE__);
@ -2852,7 +2852,7 @@ class Blog {
foreach($list_info as $key => $info_log) {
//validacion when belongs to a session
$session_img = api_get_session_image($info_log[4], $_user['status']);
$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
$title = $info_log[0];
$image = '<img src="../img/blog.gif" border="0" align="absmiddle" alt="' . $title . '">'."\n";

2
main/inc/lib/course.lib.php
Unescape View File

@ -1781,7 +1781,7 @@ class CourseManager {
tms = FROM_UNIXTIME($time)";
Database::query($sql, __FILE__, __LINE__);
return Database::get_last_insert_id();
return Database::insert_id();
}
/**

24
main/inc/lib/database.lib.php
Unescape View File

@ -642,17 +642,6 @@ class Database {
return $obj->n;
}
/**
* Gets the ID of the last item inserted into the database
*
* @author Yannick Warnier <yannick.warnier@dokeos.com>
* @return integer The last ID as returned by the DB function
* @comment This should be updated to use ADODB at some point
*/
public static function get_last_insert_id() {
return mysql_insert_id();
}
/**
* Escapes a string to insert into the database as text
* @param string The string to escape
@ -724,8 +713,10 @@ class Database {
}
/**
* Recovers the last ID of any insert query executed over this SQL connection
* @return integer Unique ID of the latest inserted row
* Gets the ID of the last item inserted into the database
*
* @return integer The last ID as returned by the DB function
* @comment This should be updated to use ADODB at some point
*/
public static function insert_id() {
return mysql_insert_id();
@ -818,5 +809,12 @@ class Database {
return api_get_language_isocode($language);
}
/**
* @deprecated Use Database::insert_id() instead.
*/
public static function get_last_insert_id() {
return mysql_insert_id();
}
}
//end class Database

2
main/inc/lib/events.lib.inc.php
Unescape View File

@ -450,7 +450,7 @@ function create_event_exercice($exo_id)
$sql = "INSERT INTO $TABLETRACK_EXERCICES ( exe_user_id, exe_cours_id )
VALUES ( ".$user_id.", '".$_cid."' )";
$res = @Database::query($sql,__FILE__,__LINE__);
$id= Database::get_last_insert_id();
$id= Database::insert_id();
return $id;
}

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

@ -95,7 +95,7 @@ class SessionManager {
$sql_insert = "INSERT INTO $tbl_session(name,date_start,date_end,id_coach,session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id,visibility)
VALUES('".Database::escape_string($name)."','$date_start','$date_end','$id_coach',".intval($_user['user_id']).",".$nb_days_acess_before.", ".$nb_days_acess_after.", ".$id_session_category.", ".$id_visibility.")";
Database::query($sql_insert ,__FILE__,__LINE__);
$id_session=Database::get_last_insert_id();
$id_session=Database::insert_id();
// add event to system log
$time = time();
@ -516,7 +516,7 @@ class SessionManager {
tms = FROM_UNIXTIME($time)";
$result = Database::query($sql,__FILE__,__LINE__);
$field_id=Database::get_last_insert_id();
$field_id=Database::insert_id();
}
return $field_id;
}
@ -679,7 +679,7 @@ class SessionManager {
} else {
$sql = "INSERT INTO $tbl_session_category(name, date_start, date_end) VALUES('".Database::escape_string($name)."','$date_start','$date_end')";
Database::query($sql ,__FILE__,__LINE__);
$id_session=Database::get_last_insert_id();
$id_session=Database::insert_id();
// add event to system log
$time = time();
$user_id = api_get_user_id();

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

@ -25,7 +25,7 @@ function add_specific_field($name) {
$sql = sprintf($sql, $table_sf, $_safe_code, $_safe_name);
$result = Database::query($sql,__FILE__,__LINE__);
if ($result) {
return Database::get_last_insert_id();
return Database::insert_id();
}
else {
return FALSE;
@ -158,7 +158,7 @@ function add_specific_field_value($id_specific_field, $course_id, $tool_id, $ref
$sql = sprintf($sql, $table_sf_values, $course_id, $tool_id, $ref_id, $id_specific_field, Database::escape_string($value));
$result = Database::query($sql,__FILE__,__LINE__);
if ($result) {
return Database::get_last_insert_id();
return Database::insert_id();
}
else {
return FALSE;

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

@ -100,7 +100,7 @@ class UserManager {
$result = Database::query($sql, __FILE__, __LINE__);
if ($result) {
//echo "id returned";
$return = Database::get_last_insert_id();
$return = Database::insert_id();
global $_configuration;
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
@ -1102,7 +1102,7 @@ class UserManager {
$result = Database::query($sql);
if ($result) {
//echo "id returned";
$return = Database::get_last_insert_id();
$return = Database::insert_id();
} else {
//echo "false - failed" ;
return false;

16
main/install/update-db-scorm-1.6.x-1.8.0.inc.php
Unescape View File

@ -141,7 +141,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
"'".mysql_real_escape_string($row['learnpath_name'])."'," .
"'".mysql_real_escape_string($row['learnpath_description'])."',$dsp_ord,'Dokeos')";
$ins_lp_res = Database::query($ins_lp_sql);
$in_id = Database::get_last_insert_id();
$in_id = Database::insert_id();
if(empty($in_id) or $in_id == false) die('Could not insert lp: '.$ins_lp_sql);
$lp_ids[$row['learnpath_id']] = $in_id;
$dsp_ord++;
@ -185,7 +185,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
")";
//echo $ins_lp_sql."<br/>\n";
$ins_res = Database::query($ins_lp_sql,__FILE__,__LINE__);
$in_id = Database::get_last_insert_id();
$in_id = Database::insert_id();
//echo "&nbsp;&nbsp;Inserted item $in_id<br />\n";
if(empty($in_id) OR $in_id == false) die('Could not insert lp: '.$ins_sql);
$parent_chaps[$row['id']] = $row['parent_chapter_id'];
@ -341,7 +341,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
$row['display_order']." " .
")";
$ins_res = Database::query($ins_lp_sql,__FILE__,__LINE__);
$in_id = Database::get_last_insert_id();
$in_id = Database::insert_id();
//echo "&nbsp;&nbsp;Inserted item $in_id (".$row['title'].")<br />\n";
if(empty($in_id) OR $in_id == false) die('Could not insert lp_item: '.$ins_sql);
$lp_items[$parent_lps[$row['chapter_id']]][$row['id']] = $in_id;
@ -443,7 +443,7 @@ foreach($courses_id_full_table_prefix_list as $course_code => $db)
")";
//echo $sql_ins_view;
$res_ins_view = Database::query($sql_ins_view,__FILE__,__LINE__);
$in_id = Database::get_last_insert_id();
$in_id = Database::insert_id();
$user_id = $row['user_id'];
$learnpath_id = $row['learnpath_id'];
$lp_view = $in_id;
@ -948,7 +948,7 @@ foreach($scorms as $my_course_code => $paths_list )
")";
//echo "$ins_sql<br/>";
$ins_res = Database::query($ins_sql,__FILE__,__LINE__);
$view_insert_id = Database::get_last_insert_id();
$view_insert_id = Database::insert_id();
}
$sel_sqlc = "SELECT * FROM $my_new_lp_item " .
"WHERE lp_id = ".$lp_ids[$my_content_id]." AND ref = '$my_identifier'";
@ -1005,7 +1005,7 @@ foreach($scorms as $my_course_code => $paths_list )
")";
if($loglevel>1){error_log("$sql_ins",0);}
$sql_res = Database::query($sql_ins,__FILE__,__LINE__);
$in_id = Database::get_last_insert_id();
$in_id = Database::insert_id();
if(empty($in_id) or $in_id == false) die('Could not insert scorm lp: '.$sql_ins);
//echo "&nbsp;&nbsp;Inserted item $in_id<br />\n";
$lp_ids[$my_content_id] = $in_id; //contains the old LP ID => the new LP ID
@ -1100,7 +1100,7 @@ foreach($scorms as $my_course_code => $paths_list )
"'$my_item_path'" .
")";
$ins_res = Database::query($ins_sql,__FILE__,__LINE__);
$item_insert_id = Database::get_last_insert_id();
$item_insert_id = Database::insert_id();
$lp_item_ids[$lp_ids[$my_content_id]][$my_sco_id]=$item_insert_id;
$lp_item_refs[$lp_ids[$my_content_id]][$my_identifier]=$item_insert_id;
}
@ -1127,7 +1127,7 @@ foreach($scorms as $my_course_code => $paths_list )
"1" .
")";
$ins_res = Database::query($ins_sql,__FILE__,__LINE__);
$view_insert_id = Database::get_last_insert_id();
$view_insert_id = Database::insert_id();
}
$ins_sql = "INSERT INTO $my_new_lp_item_view (" .
"lp_item_id, lp_view_id, view_count," .

4
main/newscorm/aicc.class.php
Unescape View File

@ -258,7 +258,7 @@ class aicc extends learnpath {
"'aicc_api.php','".$this->course_creator."',$dsp)";
if($this->debug>2){error_log('New LP - In import_aicc(), inserting path: '. $sql,0);}
$res = Database::query($sql);
$lp_id = Database::get_last_insert_id();
$lp_id = Database::insert_id();
$this->lp_id = $lp_id;
api_item_property_update(api_get_course_info($course_code),TOOL_LEARNPATH,$this->lp_id,'LearnpathAdded',api_get_user_id());
api_item_property_update(api_get_course_info($course_code),TOOL_LEARNPATH,$this->lp_id,'visible',api_get_user_id());
@ -298,7 +298,7 @@ class aicc extends learnpath {
")";
$res_item = Database::query($sql_item);
if($this->debug>1){error_log('New LP - In aicc::import_aicc() - inserting item : '.$sql_item.' : '.mysql_error(),0);}
$item_id = Database::get_last_insert_id();
$item_id = Database::insert_id();
//now update previous item to change next_item_id
if($previous != 0){
$upd = "UPDATE $new_lp_item SET next_item_id = $item_id WHERE id = $previous";

40
main/newscorm/learnpath.class.php
Unescape View File

@ -63,7 +63,7 @@ class learnpath {
var $arrMenu = array(); //array for the menu items
var $debug = 0; //logging level
var $lp_session_id =0;
/**
@ -136,7 +136,7 @@ class learnpath {
$this->preview_image= $row['preview_image'];
$this->author= $row['author'];
$this->lp_session_id = $row['session_id'];
if($this->type == 2){
if($row['force_commit'] == 1){
$this->force_commit = true;
@ -203,7 +203,7 @@ class learnpath {
$this->attempt = 1;
$sql_ins = "INSERT INTO $lp_table (lp_id,user_id,view_count) VALUES ($lp_id,$user_id,1)";
$res_ins = Database::query($sql_ins, __FILE__, __LINE__);
$this->lp_view_id = Database :: get_last_insert_id();
$this->lp_view_id = Database :: insert_id();
if ($this->debug > 2) {
error_log('New LP - learnpath::learnpath() ' . __LINE__ . ' - inserting new lp_view: ' . $sql_ins, 0);
}
@ -510,7 +510,7 @@ class learnpath {
$res_ins = Database::query($sql_ins, __FILE__, __LINE__);
if ($res_ins > 0) {
$new_item_id = Database :: get_last_insert_id($res_ins);
$new_item_id = Database :: insert_id($res_ins);
//update the item that should come after the new item
$sql_update_next = "
@ -598,10 +598,10 @@ class learnpath {
//check lp_name doesn't exist, otherwise append something
$i = 0;
$name = learnpath :: escape_string($name);
//session_id
$session_id = api_get_session_id();
$check_name = "SELECT * FROM $tbl_lp WHERE name = '$name'";
//if($this->debug>2){error_log('New LP - Checking the name for new LP: '.$check_name,0);}
$res_name = Database::query($check_name, __FILE__, __LINE__);
@ -649,7 +649,7 @@ class learnpath {
"'local','','".Database::escape_string($session_id)."')";
//if($this->debug>2){error_log('New LP - Inserting new lp '.$sql_insert,0);}
$res_insert = Database::query($sql_insert, __FILE__, __LINE__);
$id = Database :: get_last_insert_id();
$id = Database :: insert_id();
if ($id > 0) {
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_LEARNPATH, $id, 'LearnpathAdded', api_get_user_id());
@ -2280,9 +2280,9 @@ class learnpath {
return '';
}
}
/**
* Gets the learnpath session id
* Gets the learnpath session id
* @return string Learnpath theme
*/
function get_lp_session_id() {
@ -2295,7 +2295,7 @@ class learnpath {
return 0;
}
}
/**
* Gets the learnpath image
@ -2778,10 +2778,10 @@ class learnpath {
* @return string HTML TOC ready to display
*/
function get_html_toc() {
$is_allowed_to_edit = api_is_allowed_to_edit(null,true);
$charset = api_get_setting('platform_charset');
$display_action_links_with_icons = false;
@ -2796,7 +2796,7 @@ class learnpath {
// build, display
if ($is_allowed_to_edit) {
$gradebook = Security :: remove_XSS($_GET['gradebook']);
//var_dump($this->get_lp_session_id());
if ($this->get_lp_session_id()==api_get_session_id()) {
$html .= '<div class="actions_lp">';
@ -2811,8 +2811,8 @@ class learnpath {
}
$html .= '</div>';
}
}
$html .= '<div id="inner_lp_toc" class="inner_lp_toc">' . "\n";
require_once ('resourcelinker.inc.php');
@ -3221,7 +3221,7 @@ class learnpath {
$sql = "INSERT INTO $lp_view_table(lp_id,user_id,view_count)" .
"VALUES (" . $this->get_id() . "," . $this->get_user_id() . ",1)";
$res = Database::query($sql, __FILE__, __LINE__);
$id = Database :: get_last_insert_id();
$id = Database :: insert_id();
$this->lp_view_id = $id;
}
return $this->lp_view_id;
@ -3704,7 +3704,7 @@ class learnpath {
error_log('New LP - Inserting new lp_view for restart: ' . $sql, 0);
}
$res = Database::query($sql, __FILE__, __LINE__);
if ($view_id = Database :: get_last_insert_id($res)) {
if ($view_id = Database :: insert_id($res)) {
$this->lp_view_id = $view_id;
$this->attempt = $this->attempt + 1;
} else {
@ -4609,9 +4609,9 @@ class learnpath {
* @return string
*/
function overview() {
$is_allowed_to_edit = api_is_allowed_to_edit(null,true);
$platform_charset = api_get_system_encoding();
if ($this->debug > 0) {
error_log('New LP - In learnpath::overview()', 0);

4
main/newscorm/learnpathItem.class.php
Unescape View File

@ -2235,7 +2235,7 @@ function get_terms()
if($this->debug>2){error_log('New LP - In learnpathItem::write_to_db() - Inserting into item_view forced: '.$sql,0);}
$res = Database::query($sql,__FILE__,__LINE__);
$this->db_item_view_id = Database::get_last_insert_id();
$this->db_item_view_id = Database::insert_id();
$inserted = true;
}
@ -2281,7 +2281,7 @@ function get_terms()
"'".$this->lesson_location."')";
if($this->debug>2){error_log('New LP - In learnpathItem::write_to_db() - Inserting into item_view: '.$sql,0);}
$res = Database::query($sql,__FILE__,__LINE__);
$this->db_item_view_id = Database::get_last_insert_id();
$this->db_item_view_id = Database::insert_id();
} else {
$sql = '';
if($this->type=='hotpotatoes') {

4
main/newscorm/learnpath_functions.inc.php
Unescape View File

@ -357,7 +357,7 @@ function insert_item($type = 'item', $name, $chapter_description = '', $parent_i
{
return false;
}
$id = Database :: get_last_insert_id();
$id = Database :: insert_id();
}
elseif ($type === 'item')
{
@ -372,7 +372,7 @@ function insert_item($type = 'item', $name, $chapter_description = '', $parent_i
{
return false;
}
$id = Database :: get_last_insert_id();
$id = Database :: insert_id();
}
return $id;
}

6
main/newscorm/resourcelinker.php
Unescape View File

@ -148,7 +148,7 @@ if (!empty ($_POST['add_chapter']) && !empty ($_POST['title']))
"VALUES "."($learnpath_id,'dokeos_chapter','$title', $chapter_id, $previous, 0, $order )";
//error_log('New LP - Inserting new resource: '.$sql,0);
$res = Database::query($sql, __FILE__, __LINE__);
$my_id = Database::get_last_insert_id($res);
$my_id = Database::insert_id($res);
if($previous>0){
$sql = "UPDATE $tbl_lp_item SET next_item_id = $my_id WHERE id=$previous";
$res = Database::query($sql,__FILE__,__LINE__);
@ -251,7 +251,7 @@ if ($add)
"VALUES (".$learnpath_id.",'dokeos_chapter','".$learnpath_chapter_name."',".$chapter_id.",$previous,0,".$lastorder.")";
//error_log('New LP - Inserting new resource: '.$sql,0);
$res = Database::query($sql, __FILE__, __LINE__);
$my_id = Database::get_last_insert_id($res);
$my_id = Database::insert_id($res);
if($previous>0){
$sql = "UPDATE $tbl_lp_item SET next_item_id = $my_id WHERE id=$previous";
$res = Database::query($sql,__FILE__,__LINE__);
@ -347,7 +347,7 @@ if ($add)
"VALUES ($learnpath_id, '$title','$chapter_id', '$addedresource_item','$addedresourceid[$i]',$previous,0,'".$lastorder."')";
//error_log('New LP - Inserting new resource: '.$sql,0);
$result = Database::query($sql, __FILE__, __LINE__);
$my_id = Database::get_last_insert_id($result);
$my_id = Database::insert_id($result);
if($previous>0){
$sql = "UPDATE $tbl_lp_item SET next_item_id = $my_id WHERE id = $previous";
//error_log($sql,0);

4
main/newscorm/scorm.class.php
Unescape View File

@ -388,7 +388,7 @@ class scorm extends learnpath {
"VALUES (2,'".$myname."', '".$oOrganization->get_ref()."','','".$this->subdir."', 0, 'embedded', '".$this->manifest_encoding."','scorm_api.php',$dsp)";
if($this->debug>1){error_log('New LP - In import_manifest(), inserting path: '. $sql,0);}
$res = Database::query($sql,__FILE__,__LINE__);
$lp_id = Database::get_last_insert_id();
$lp_id = Database::insert_id();
$this->lp_id = $lp_id;
//insert into item_property
api_item_property_update(api_get_course_info($course_code),TOOL_LEARNPATH,$this->lp_id,'LearnpathAdded',api_get_user_id());
@ -470,7 +470,7 @@ class scorm extends learnpath {
")";
$res_item = Database::query($sql_item);
if($this->debug>1){error_log('New LP - In import_manifest(), inserting item : '.$sql_item.' : '.mysql_error(),0);}
$item_id = Database::get_last_insert_id();
$item_id = Database::insert_id();
//now update previous item to change next_item_id
$upd = "UPDATE $new_lp_item SET next_item_id = $item_id WHERE id = $previous";
$upd_res = Database::query($upd);

2
main/newscorm/scorm_admin.php
Unescape View File

@ -181,7 +181,7 @@ switch($action){
{
$sql ="INSERT INTO $tbl_learnpath_main (learnpath_name, learnpath_description) VALUES ('".domesticate($learnpath_name)."','".domesticate($learnpath_description)."')";
Database::query($sql,__FILE__,__LINE__);
$my_lp_id = Database::get_last_insert_id();
$my_lp_id = Database::insert_id();
$sql ="INSERT INTO $tbl_tool (name, link, image, visibility, admin, address, added_tool) VALUES ('".domesticate($learnpath_name)."','learnpath/learnpath_handler.php?learnpath_id=$my_lp_id','scormbuilder.gif','1','0','pastillegris.gif',0)";
Database::query($sql,__FILE__,__LINE__);
//instead of displaying this info text, get the user directly to the learnpath edit page

18
main/notebook/index.php
Unescape View File

@ -55,7 +55,7 @@ Display::display_introduction_section(TOOL_NOTEBOOK);
// Action handling: Adding a note
if (isset($_GET['action']) && $_GET['action'] == 'addnote')
{
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();
}
@ -257,12 +257,12 @@ function save_note($values) {
'".Database::escape_string(date('Y-m-d H:i:s'))."',
'0')";
$result = Database::query($sql, __FILE__, __LINE__);
$id = Database::get_last_insert_id();
$id = Database::insert_id();
if ($id > 0) {
//insert into item_property
api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, $id, 'NotebookAdded', api_get_user_id());
}
// display the feedback message
Display::display_confirmation_message(get_lang('NoteAdded'));
}
@ -274,7 +274,7 @@ function get_note_information($notebook_id) {
$sql = "SELECT notebook_id AS notebook_id,
title AS note_title,
description AS note_comment,
session_id AS session_id
session_id AS session_id
FROM $t_notebook
WHERE notebook_id = '".Database::escape_string($notebook_id)."' ";
$result = Database::query($sql, __FILE__, __LINE__);
@ -306,7 +306,7 @@ function update_note($values) {
//update item_property (update)
api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, Database::escape_string($values['notebook_id']), 'NotebookUpdated', api_get_user_id());
// display the feedback message
Display::display_confirmation_message(get_lang('NoteUpdated'));
}
@ -317,17 +317,17 @@ function delete_note($notebook_id) {
$sql = "DELETE FROM $t_notebook WHERE notebook_id='".Database::escape_string($notebook_id)."' AND user_id = '".Database::escape_string(api_get_user_id())."'";
$result = Database::query($sql, __FILE__, __LINE__);
//update item_property (delete)
api_item_property_update(api_get_course_info(), TOOL_NOTEBOOK, Database::escape_string($notebook_id), 'delete', api_get_user_id());
Display::display_confirmation_message(get_lang('NoteDeleted'));
}
function display_notes() {
global $_user;
if (!$_GET['direction'])
{
$sort_direction = 'ASC';
@ -355,7 +355,7 @@ function display_notes() {
elseif(api_is_allowed_to_session_edit(false,true)){
echo '<a href="index.php?'.api_get_cidreq().'&amp;action=addnote">'.Display::return_icon('filenew.gif',get_lang('NoteAddNew')).get_lang('NoteAddNew').'</a>';
}
} else {
echo '<a href="javascript:void(0)">'.Display::return_icon('filenew.gif',get_lang('NoteAddNew')).get_lang('NoteAddNew').'</a>';
}

4
main/reservation/rsys.php
Unescape View File

@ -167,7 +167,7 @@ class Rsys {
if (Rsys :: check_category($naam)) {
$sql = "INSERT INTO ".Rsys :: getTable("category")." (name) VALUES ('".Database::escape_string($naam)."')";
Database::query($sql, __FILE__, __LINE__);
return Database::get_last_insert_id();
return Database::insert_id();
}
return false;
}
@ -354,7 +354,7 @@ class Rsys {
if (Rsys :: check_item($name, $category)) {
$sql = "INSERT INTO ".Rsys :: getTable("item")." (category_id,course_code,name,description,creator) VALUES ('".Database::escape_string($category)."','".Database::escape_string($course)."','".Database::escape_string($name)."','".Database::escape_string($description)."','".api_get_user_id()."')";
Database::query($sql, __FILE__, __LINE__);
return Database::get_last_insert_id();
return Database::insert_id();
}
return false;
}

12
main/webservices/registration.soap.php
Unescape View File

@ -252,7 +252,7 @@ function DokeosWSCreateUsers($params) {
$result = Database::query($sql, __FILE__, __LINE__);
if ($result) {
//echo "id returned";
$return = Database::get_last_insert_id();
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if (api_get_current_access_url_id() != -1) {
@ -458,7 +458,7 @@ function DokeosWSCreateUser($params) {
$result = Database::query($sql, __FILE__, __LINE__);
if ($result) {
//echo "id returned";
$return = Database::get_last_insert_id();
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if (api_get_current_access_url_id() != -1) {
@ -746,7 +746,7 @@ function DokeosWSCreateUsersPasswordCrypted($params) {
$result = Database::query($sql, __FILE__, __LINE__);
if ($result) {
//echo "id returned";
$return = Database::get_last_insert_id();
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if (api_get_current_access_url_id() != -1) {
@ -975,7 +975,7 @@ function DokeosWSCreateUserPasswordCrypted($params) {
$result = Database::query($sql, __FILE__, __LINE__);
if ($result) {
//echo "id returned";
$return = Database::get_last_insert_id();
$return = Database::insert_id();
require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
if ($_configuration['multiple_access_urls'] == true) {
if (api_get_current_access_url_id() != -1) {
@ -3160,7 +3160,7 @@ function DokeosWSCreateSession($params) {
continue;
} else {
Database::query("INSERT INTO $tbl_session(name,date_start,date_end,id_coach,session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end) VALUES('".addslashes($name)."','$date_start','$date_end','$id_coach',".intval($_user['user_id']).",".$nb_days_acess_before.", ".$nb_days_acess_after.")", __FILE__, __LINE__);
$id_session = Database::get_last_insert_id();
$id_session = Database::insert_id();
// Save new fieldlabel into course_field table.
$field_id = SessionManager::create_session_extra_field($original_session_id_name, 1, $original_session_id_name);
@ -3359,7 +3359,7 @@ function DokeosWSEditSession($params) {
"nb_days_access_after_end='". $nb_days_acess_after."'" .
" WHERE id='".$id."'";
Database::query($sql, __FILE__, __LINE__);
$id_session = Database::get_last_insert_id();
$id_session = Database::insert_id();
if (is_array($extra_list) && count($extra_list) > 0) {
foreach ($extra_list as $extra) {

5
tests/main/inc/lib/database.lib.test.php
Unescape View File

@ -185,11 +185,6 @@ class TestDatabase extends UnitTestCase {
$this->assertTrue(is_string($res));
}
function testGetLastInsertId() {
$res=$this->dbase->get_last_insert_id();
$this->assertTrue(is_numeric($res));
}
function testGetMainDatabase() {
global $_configuration;
$res=$this->dbase->get_main_database();

4
tests/main/inc/lib/sessionmanager.lib.test.php
Unescape View File

@ -36,10 +36,10 @@ class TestSessionManager extends UnitTestCase {
$snb_days_acess_after='';
$nolimit='';
$coach_username='';
$id_session=Database::get_last_insert_id();
$id_session=Database::insert_id();
ob_start();
$res=SessionManager::create_session($sname,$syear_start,$smonth_start,$sday_start,$syear_end,$smonth_end,$sday_end,$snb_days_acess_before,$snb_days_acess_after,$nolimit,$coach_username);
$idsesion->expectOnce(Database::get_last_insert_id());
$idsesion->expectOnce(Database::insert_id());
$this->assertTrue(is_object($idsesion));
$this->assertTrue(is_numeric($id_session));
$this->assertTrue(is_string($res));

Write Preview
Loading…
Cancel
Save