From 3879f513777d52d948186d6b5fd2b77211df4238 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Wed, 10 Feb 2010 06:58:53 +0200 Subject: [PATCH] Feature #272 - Code update according to the recent changes within the Database class - direct use elimination in some places of MySQL-specific functions. --- main/inc/banner.inc.php | 3 ++- main/inc/global.inc.php | 12 ++++++++++-- main/inc/lib/add_course.lib.inc.php | 3 ++- main/inc/lib/export.lib.inc.php | 3 ++- main/metadata/importdocs.php | 3 ++- main/metadata/importlinks.php | 3 ++- main/metadata/importmanifest.php | 5 ++++- main/online/online_links.php | 6 ++++-- main/online/online_streaming.php | 3 ++- 9 files changed, 30 insertions(+), 11 deletions(-) diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php index 1587126fe5..5d5db8f235 100755 --- a/main/inc/banner.inc.php +++ b/main/inc/banner.inc.php @@ -413,7 +413,8 @@ if (isset ($dokeos_database_connection)) { // if multiple database, prefix table names with the course database name in SQL queries (or no prefix if the table is in // the main database) // (ex. SELECT * FROM `table_from_main_db` - SELECT * FROM `courseDB`.`table_from_course_db`) - mysql_select_db($_configuration['main_database'], $dokeos_database_connection); + //mysql_select_db($_configuration['main_database'], $dokeos_database_connection); + Database::select_db($_configuration['main_database'], $dokeos_database_connection); } ?> diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index 8188326aa1..f4df5c1279 100755 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -95,7 +95,14 @@ if (empty($_configuration['statistics_database']) && $already_installed) { } // Connect to the server database and select the main dokeos database. -if (!($dokeos_database_connection = @mysql_connect($_configuration['db_host'], $_configuration['db_user'], $_configuration['db_password']))) { +//if (!($dokeos_database_connection = @mysql_connect($_configuration['db_host'], $_configuration['db_user'], $_configuration['db_password']))) { +if (!($dokeos_database_connection = @Database::connect( + array( + 'server' => $_configuration['db_host'], + 'username' => $_configuration['db_user'], + 'password' => $_configuration['db_password'], + 'persistent' => $_configuration['db_persistent_connection'] // When $_configuration['db_persistent_connection'] is set, it is expected to be a boolean type. + )))) { $global_error_code = 3; // The database server is not available or credentials are invalid. require $includePath.'/global_error_message.inc.php'; @@ -111,7 +118,8 @@ if (!$_configuration['db_host']) { // The system has not been designed to use special SQL modes that were introduced since MySQL 5. Database::query("set session sql_mode='';", __FILE__, __LINE__); -if (!mysql_select_db($_configuration['main_database'], $dokeos_database_connection)) { +//if (!mysql_select_db($_configuration['main_database'], $dokeos_database_connection)) { +if (!Database::select_db($_configuration['main_database'], $dokeos_database_connection)) { $global_error_code = 5; // Connection to the main Dokeos database is impossible, it might be missing or restricted or its configuration option might be incorrect. require $includePath.'/global_error_message.inc.php'; diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 15836ff785..6ef356c105 100755 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -2072,7 +2072,8 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$default_doc if (file_exists($file_to_include)) include (api_get_path(SYS_CODE_PATH) . $file_to_include); - mysql_select_db("$courseDbName"); + //mysql_select_db("$courseDbName"); + Database::select_db("$courseDbName"); /* ============================================================================== diff --git a/main/inc/lib/export.lib.inc.php b/main/inc/lib/export.lib.inc.php index f34f1df49f..ac5528824f 100755 --- a/main/inc/lib/export.lib.inc.php +++ b/main/inc/lib/export.lib.inc.php @@ -195,7 +195,8 @@ function backupDatabase($link, $db_name, $structure, $donnees, $format = 'SQL', $error_no['backup'][] = '1'; return false; } - mysql_select_db($db_name); + //mysql_select_db($db_name); + Database::select_db($db_name); $format = strtolower($format); $filename = $whereSave.'/courseDbContent.'.$format; $format = strtoupper($format); diff --git a/main/metadata/importdocs.php b/main/metadata/importdocs.php index f32ca67b52..95a93cd620 100755 --- a/main/metadata/importdocs.php +++ b/main/metadata/importdocs.php @@ -92,7 +92,8 @@ if (count($idt) && file_exists($phpDigIncCn)) if(isset($db)) { - mysql_select_db($_configuration['main_database'], $db); // back to Dokeos + //mysql_select_db($_configuration['main_database'], $db); + Database::select_db($_configuration['main_database'], $db); } } else diff --git a/main/metadata/importlinks.php b/main/metadata/importlinks.php index 8ff7a4bb92..2a3f82f75b 100755 --- a/main/metadata/importlinks.php +++ b/main/metadata/importlinks.php @@ -263,7 +263,8 @@ elseif ($slo == get_lang('Index') && file_exists($phpDigIncCn) && count($mceids) if(isset($db)) { - mysql_select_db($_configuration['main_database'], $db); // back to Dokeos + //mysql_select_db($_configuration['main_database'], $db); + Database::select_db($_configuration['main_database'], $db); } } elseif ($slo == get_lang('Index')) diff --git a/main/metadata/importmanifest.php b/main/metadata/importmanifest.php index 9377ff9c47..8157f96564 100755 --- a/main/metadata/importmanifest.php +++ b/main/metadata/importmanifest.php @@ -443,7 +443,10 @@ elseif ($smo == get_lang('Index') && file_exists($phpDigIncCn) && } // possible enhancement: UPDATE spider record for still existing pages - if(isset($db)) mysql_select_db($_configuration['main_database'], $db); // back to Dokeos + if(isset($db)) { + //mysql_select_db($_configuration['main_database'], $db); + Database::select_db($_configuration['main_database'], $db); + } } elseif ($smo == get_lang('Index')) { diff --git a/main/online/online_links.php b/main/online/online_links.php index 33fddec931..1f156a8d7a 100755 --- a/main/online/online_links.php +++ b/main/online/online_links.php @@ -127,7 +127,8 @@ if($_POST['sent']) } } - mysql_close(); + //mysql_close(); + Database::close(); header('Location: '.api_get_self()); exit(); } @@ -139,7 +140,8 @@ if($action == 'delete') $query="DELETE FROM $tbl_online_link WHERE id='$link'"; Database::query($query,__FILE__,__LINE__); - mysql_close(); + //mysql_close(); + Database::close(); header('Location: '.api_get_self()); exit(); } diff --git a/main/online/online_streaming.php b/main/online/online_streaming.php index 9cd7cf97bf..c5e3193677 100755 --- a/main/online/online_streaming.php +++ b/main/online/online_streaming.php @@ -72,7 +72,8 @@ if($_POST['sent']) fclose($fp); } - mysql_close(); + //mysql_close(); + Database::close(); header('Location: online_master.php'); exit(); }