From a04ca2da588e3b2455f4e70641e5d729d9b9b255 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sat, 18 Feb 2012 23:11:37 -0500 Subject: [PATCH] Cleanup - Removed references to MySQL --- main/newscorm/learnpath_functions.inc.php | 2 +- main/newscorm/lp_ajax_initialize.php | 4 ++-- main/newscorm/resourcelinker.inc.php | 8 ++++---- main/newscorm/scorm.class.php | 2 +- main/newscorm/storageapi.php | 15 +++++++-------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/main/newscorm/learnpath_functions.inc.php b/main/newscorm/learnpath_functions.inc.php index 4f3a0cc2e8..1390a2e521 100644 --- a/main/newscorm/learnpath_functions.inc.php +++ b/main/newscorm/learnpath_functions.inc.php @@ -1485,7 +1485,7 @@ function exportitem($id, $item_id, $item_type, $add_scorm_communications = false $content = text_filter($content); // 3.3 Get a UNIX(?<-mktime) Timestamp of the end_date for this announcement. - $last_post_datetime = $myrow['end_date']; // post time format datetime de mysql + $last_post_datetime = $myrow['end_date']; // post time format datetime of database layer (MySQL is assumed) list ($last_post_date, $last_post_time) = split(' ', $last_post_datetime); list ($year, $month, $day) = explode('-', $last_post_date); list ($hour, $min) = explode(':', $last_post_time); diff --git a/main/newscorm/lp_ajax_initialize.php b/main/newscorm/lp_ajax_initialize.php index 5347522daf..60c68b7fdb 100644 --- a/main/newscorm/lp_ajax_initialize.php +++ b/main/newscorm/lp_ajax_initialize.php @@ -116,8 +116,8 @@ function initialize_item($lp_id, $user_id, $view_id, $next_item) { FROM ".$mycoursedb." WHERE lp_iv_id = ".$mylp_iv_id." ORDER BY id ASC;"; - $res = mysql_query($sql); - while ($row = mysql_fetch_row($res)) { + $res = Database::query($sql); + while ($row = Database::fetch_row($res)) { $phpobjectives[] = $row; } $myobjectives = json_encode($phpobjectives); diff --git a/main/newscorm/resourcelinker.inc.php b/main/newscorm/resourcelinker.inc.php index 462e03b7cb..882a8ac048 100644 --- a/main/newscorm/resourcelinker.inc.php +++ b/main/newscorm/resourcelinker.inc.php @@ -729,9 +729,9 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_ case TOOL_DOCUMENT: case 'Document': $dbTable = Database::get_course_table(TABLE_DOCUMENT); - $mysql = "SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id"; - //error_log('New LP - Querying document table: '.$mysql,0); - $result = Database::query($mysql); + $my_sql = "SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id"; + //error_log('New LP - Querying document table: '.$my_sql,0); + $result = Database::query($my_sql); $myrow = Database::fetch_array($result); $pathname = explode('/', $myrow['path']); // Making a correct name for the link. @@ -1838,4 +1838,4 @@ function rl_get_resource_name($course_code, $learnpath_id, $id_in_path) { */ } return stripslashes($output); -} \ No newline at end of file +} diff --git a/main/newscorm/scorm.class.php b/main/newscorm/scorm.class.php index 8113f8ac0a..e630a43e61 100644 --- a/main/newscorm/scorm.class.php +++ b/main/newscorm/scorm.class.php @@ -378,7 +378,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); } + if ($this->debug > 1) { error_log('New LP - In import_manifest(), inserting item : '.$sql_item.' : '.Database::error(), 0); } $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 c_id = $course_id AND id = $previous"; diff --git a/main/newscorm/storageapi.php b/main/newscorm/storageapi.php index b0a81239cf..7ae98dab54 100644 --- a/main/newscorm/storageapi.php +++ b/main/newscorm/storageapi.php @@ -7,8 +7,7 @@ require_once('../inc/global.inc.php'); // variable cleaning... foreach (Array("svkey", "svvalue") as $key) - //FIXME use chamilo api - $_REQUEST[$key] = mysql_escape_string($_REQUEST[$key]); + $_REQUEST[$key] = Database::escape_string($_REQUEST[$key]); foreach (Array("svuser", "svcourse", "svsco", "svlength", "svasc") as $key) $_REQUEST[$key] = intval($_REQUEST[$key]); @@ -79,7 +78,7 @@ function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) { and course_id = '$sv_course' and sv_key = '$sv_key'"; $res = Database::query($sql); - if (mysql_num_rows($res) > 0) { + if (Database::num_rows($res) > 0) { $row = Database::fetch_assoc($res); if (get_magic_quotes_gpc()) { return stripslashes($row['sv_value']); @@ -141,7 +140,7 @@ function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $ and list.sv_key = search.sv_key order by list.sv_value" ; $res = Database::query($sql); - if (mysql_num_rows($res) > 0) { + if (Database::num_rows($res) > 0) { $row = Database::fetch_assoc($res); return $row['position']; } @@ -151,13 +150,13 @@ function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $ } function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) { - $sv_value = mysql_real_escape_string($sv_value); + $sv_value = Database::escape_string($sv_value); $sql = "replace into ".Database::get_main_table(TABLE_MAIN_STORED_VALUES)." (user_id, sco_id, course_id, sv_key, sv_value) values ('$sv_user','$sv_sco','$sv_course','$sv_key','$sv_value')"; $res = Database::query($sql); - return mysql_affected_rows(); + return Database::affected_rows(); } function storage_getall($sv_user, $sv_course, $sv_sco) { @@ -178,7 +177,7 @@ function storage_getall($sv_user, $sv_course, $sv_sco) { } function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) { - $sv_value = mysql_real_escape_string($sv_value); + $sv_value = Database::escape_string($sv_value); Database::query("start transaction"); $sqlorder = "select ifnull((select max(stack_order) from ".Database::get_main_table(TABLE_MAIN_STORED_VALUES_STACK)." @@ -261,7 +260,7 @@ function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key) { and course_id='$sv_course' and sv_key='$sv_key'"; $res = Database::query($sql); - return mysql_num_rows($res); + return Database::num_rows($res); } function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key) {