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

#4694 add feedback during installation

Browse Source
skala
Laurent Opprecht 14 years ago
parent 8348ea7fe5
commit f0076330a4
10 changed files with 263 additions and 236 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. 27
      main/inc/lib/log.class.php
  2. 30
      main/install/i_database.class.php
  3. 96
      main/install/update-db-1.8.5-1.8.6.inc.php
  4. 48
      main/install/update-db-1.8.6-1.8.6.1.inc.php
  5. 78
      main/install/update-db-1.8.6.1-1.8.6.2.inc.php
  6. 6
      main/install/update-db-1.8.6.2-1.8.7.inc.php
  7. 114
      main/install/update-db-1.8.7-1.8.8.inc.php
  8. 78
      main/install/update-db-1.8.8-1.9.0.inc.php
  9. 10
      main/install/update-files-1.8.5-1.8.6.inc.php
  10. 12
      main/install/update-files-1.8.6.1-1.8.6.2.inc.php

27
main/inc/lib/log.class.php
Unescape View File

@ -2,10 +2,34 @@
use Monolog\Logger;
/**
* Since static constructors do not exist in php the line below serves as a
* substitute.
*
* Log is used by install which do not use autoload at the moment. If it becomes
* the case then the line below may/should be moved to the main autoloading
* function.
*/
Log::register_autoload();
/**
* Description of log
* Provides access to the main log - i.e. stderr - and allows to register events.
* It is a facade to the monolog library:
*
* Log::error('message');
* Log::warning('message');
* ...
*
*
* Note:
* This class uses a static approach which has the benefit of being simpler but do
* no allow as much freedom as using an object approche. Another approach could be
*
* Chamilo::log()->error('message');
* Chamilo::log()->warning('message');
*
* To somewhat alleviate this issue the user can register a different logger if hew
* wants.
*
* @license see /license.txt
* @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
@ -92,6 +116,7 @@ class Log
$file = str_replace($root, '', $file);
$file = trim($file, DIRECTORY_SEPARATOR);
$line = $context['line'];
$line = str_pad($line, 4, ' ', STR_PAD_LEFT);
$message = "[$file:$line] " . $message;
self::logger()->addRecord($level, $message, $context);

30
main/install/i_database.class.php
Unescape View File

@ -1,24 +1,42 @@
<?php
/**
* Install database. With logging.
* Install database. Provides access to the Database class and allows to add hooks
* for logging, testing, etc during installation.
*
*
*
* @copyright (c) 2012 University of Geneva
* @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
* @author Laurent Opprecht <laurent@opprecht.info>
* @license see /license.txt
* @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
*/
class iDatabase extends Database
{
private static $is_logging = true;
static function is_logging()
{
return self::$is_logging;
}
static function set_is_logging($value)
{
self::$is_logging = $value;
}
static function select_db($database_name, $connection = null)
{
Log::notice(__FUNCTION__ . ' ' . $database_name, Log::frame(1));
if (self::is_logging()) {
Log::notice(__FUNCTION__ . ' ' . $database_name, Log::frame(1));
}
parent::select_db($database_name, $connection);
}
static function query($query, $connection = null, $file = null, $line = null)
{
Log::notice(__FUNCTION__ . ' ' . $query, Log::frame(1));
if (self::is_logging()) {
Log::notice(__FUNCTION__ . ' ' . $query, Log::frame(1));
}
parent::query($query, $connection, $file, $line);
}

96
main/install/update-db-1.8.5-1.8.6.inc.php
Unescape View File

@ -87,12 +87,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach ($m_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbNameForm,$query)");
Log::notice("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbNameForm, executed: $query");
}
@ -107,15 +107,15 @@ if (defined('SYSTEM_INSTALLATION')) {
// Filling the access_url_rel_user table with access_url_id by default = 1
$query = "SELECT user_id FROM $dbNameForm.user";
$result_users = Database::query($query);
while ($row = Database::fetch_array($result_users, 'NUM')) {
$result_users = iDatabase::query($query);
while ($row = iDatabase::fetch_array($result_users, 'NUM')) {
$user_id = $row[0];
$sql = "INSERT INTO $dbNameForm.access_url_rel_user SET user_id=$user_id, access_url_id=1";
$res = Database::query($sql);
$res = iDatabase::query($sql);
//Updating user image
$query = "SELECT picture_uri FROM $dbNameForm.user WHERE user_id=$user_id";
$res = Database::query($query);
$picture_uri = Database::fetch_array($res, 'NUM');
$res = iDatabase::query($query);
$picture_uri = iDatabase::fetch_array($res, 'NUM');
$file = $picture_uri[0];
$dir = api_get_path(SYS_CODE_PATH).'upload/users/';
$image_repository = file_exists($dir.$file) ? $dir.$file : $dir.$user_id.'/'.$file;
@ -167,10 +167,10 @@ if (defined('SYSTEM_INSTALLATION')) {
}
// Filling the access_url_rel_session table with access_url_id by default = 1
$query = "SELECT id FROM $dbNameForm.session";
$result = Database::query($query);
while ($row = Database::fetch_array($result, 'NUM')) {
$result = iDatabase::query($query);
while ($row = iDatabase::fetch_array($result, 'NUM')) {
$sql = "INSERT INTO $dbNameForm.access_url_rel_session SET session_id=".$row[0].", access_url_id=1";
$res = Database::query($sql);
$res = iDatabase::query($sql);
}
// Since the parser of the migration DB does not work for this kind of inserts (HTML) we move it here
@ -209,7 +209,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
/*
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -259,7 +259,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
*/
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -299,7 +299,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');
';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleLeftList\', \'TemplateTitleListLeftListDescription\', \'leftlist.gif\', \'
@ -337,7 +337,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleLeftRightList\', \'TemplateTitleLeftRightListDescription\', \'leftrightlist.gif\', \'
@ -389,7 +389,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleRightList\', \'TemplateTitleRightListDescription\', \'rightlist.gif\', \'
@ -428,7 +428,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
/*
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -455,7 +455,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</tr>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
*/
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -491,7 +491,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');
';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleDesc\', \'TemplateTitleCheckListDescription\', \'description.gif\', \'
@ -520,7 +520,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');
';
$res = Database::query($sql);
$res = iDatabase::query($sql);
/*
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -561,7 +561,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
*/
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -627,7 +627,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
/*
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -670,7 +670,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');
';
$res = Database::query($sql);
$res = iDatabase::query($sql);
*/
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -737,7 +737,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</body>
\');
';
$res = Database::query($sql);
$res = iDatabase::query($sql);
/*
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -771,7 +771,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
*/
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
@ -838,7 +838,7 @@ if (defined('SYSTEM_INSTALLATION')) {
<br />
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleAudio\', \'TemplateTitleAudioDescription\', \'audiocomment.gif\', \'
@ -873,7 +873,7 @@ if (defined('SYSTEM_INSTALLATION')) {
</p>
</body>
\');';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleVideo\', \'TemplateTitleVideoDescription\', \'video.gif\', \'
@ -935,7 +935,7 @@ if (defined('SYSTEM_INSTALLATION')) {
<style type="text/css">body{}</style><!-- to fix a strange bug appearing with firefox when editing this template -->
</body>
\'); ';
$res = Database::query($sql);
$res = iDatabase::query($sql);
$sql = 'INSERT INTO '.$dbNameForm.'.system_template (title, comment, image, content) VALUES
(\'TemplateTitleFlash\', \'TemplateTitleFlashDescription\', \'flash.gif\', \'
@ -959,11 +959,11 @@ if (defined('SYSTEM_INSTALLATION')) {
</center>
</body>
\'); ';
$res = Database::query($sql);
$res = iDatabase::query($sql);
// Check if course_module exists, as it was not installed in Dokeos 1.8.5 because of a broken query, and $sql = 'INSERT it if necessary
$query = "SELECT * FROM $dbNameForm.course_module";
$result = Database::query($query);
$result = iDatabase::query($query);
if ($result === false) {
//the course_module table doesn't exist, create it
$sql = "CREATE TABLE $dbNameForm.course_module (
@ -977,7 +977,7 @@ if (defined('SYSTEM_INSTALLATION')) {
PRIMARY KEY (id)
)
";
$result = Database::query($sql);
$result = iDatabase::query($sql);
if ($result !== false) {
$sql = "INSERT INTO $dbNameForm.course_module (name, link, image, `row`,`column`, position) VALUES
('calendar_event','calendar/agenda.php','agenda.gif',1,1,'basic'),
@ -1008,7 +1008,7 @@ if (defined('SYSTEM_INSTALLATION')) {
('gradebook','gradebook/index.php','gradebook.gif',2,2,'basic'),
('glossary','glossary/index.php','glossary.gif',2,1,'basic'),
('notebook','notebook/index.php','notebook.gif',2,1,'basic')";
$res = Database::query($sql);
$res = iDatabase::query($sql);
}
}
@ -1026,12 +1026,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbStatsForm,$dblist)) {
Log::error('Database '.$dbStatsForm.' was not found, skipping');
} else {
Database::select_db($dbStatsForm);
iDatabase::select_db($dbStatsForm);
foreach ($s_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbStatsForm,$query)");
Log::notice("iDatabase::query($dbStatsForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbStatsForm, executed: $query");
}
@ -1052,13 +1052,13 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbUserForm,$dblist)) {
Log::error('Database '.$dbUserForm.' was not found, skipping');
} else {
Database::select_db($dbUserForm);
iDatabase::select_db($dbUserForm);
foreach ($u_q_list as $query) {
if ($only_test) {
error_log("Database::query($dbUserForm,$query)");
error_log("iDatabase::query($dbUserForm,$query)");
error_log("In $dbUserForm, executed: $query");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
}
}
}
@ -1081,15 +1081,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
error_log('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
$res = Database::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
iDatabase::select_db($dbNameForm);
$res = iDatabase::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.5-1.8.6.inc.php'); }
if (Database::num_rows($res) > 0) {
if (iDatabase::num_rows($res) > 0) {
$i = 0;
$list = array();
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
$list[] = $row;
$i++;
}
@ -1100,7 +1100,7 @@ if (defined('SYSTEM_INSTALLATION')) {
* without a database name
*/
if (!$singleDbForm) { //otherwise just use the main one
Database::select_db($row_course['db_name']);
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
@ -1110,9 +1110,9 @@ if (defined('SYSTEM_INSTALLATION')) {
}
if ($only_test) {
Log::notice("Database::query(".$row_course['db_name'].",$query)");
Log::notice("iDatabase::query(".$row_course['db_name'].",$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In ".$row_course['db_name'].", executed: $query");
}
@ -1128,11 +1128,11 @@ if (defined('SYSTEM_INSTALLATION')) {
}
// Shared documents folder
$query = "INSERT INTO $t_d (path,title,filetype,size) VALUES ('/shared_folder','".get_lang('SharedDocumentsDirectory')."','folder','0')";
$myres = Database::query($query);
$myres = iDatabase::query($query);
if ($myres !== false) {
$doc_id = Database::insert_id();
$doc_id = iDatabase::insert_id();
$query = "INSERT INTO $t_ip (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(),$doc_id,'FolderAdded',1,0,NULL,1)";
$myres = Database::query($query);
$myres = iDatabase::query($query);
}
}
}

48
main/install/update-db-1.8.6-1.8.6.1.inc.php
Unescape View File

@ -87,12 +87,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm,$dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach($m_q_list as $query) {
if ($only_test){
Log::notice("Database::query($dbNameForm,$query)");
Log::notice("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbNameForm, executed: $query");
}
@ -116,12 +116,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbStatsForm,$dblist)) {
Log::error('Database '.$dbStatsForm.' was not found, skipping');
} else {
Database::select_db($dbStatsForm);
iDatabase::select_db($dbStatsForm);
foreach ($s_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbStatsForm,$query)");
Log::notice("iDatabase::query($dbStatsForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbStatsForm, executed: $query");
}
@ -142,13 +142,13 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbUserForm, $dblist)) {
Log::error('Database '.$dbUserForm.' was not found, skipping');
} else {
Database::select_db($dbUserForm);
iDatabase::select_db($dbUserForm);
foreach ($u_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbUserForm,$query)");
Log::notice("iDatabase::query($dbUserForm,$query)");
Log::notice("In $dbUserForm, executed: $query");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
}
}
}
@ -171,15 +171,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
$res = Database::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
iDatabase::select_db($dbNameForm);
$res = iDatabase::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.6-1.8.6.1.inc.php'); }
if (Database::num_rows($res) > 0) {
if (iDatabase::num_rows($res) > 0) {
$i = 0;
$list = array();
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
$list[] = $row;
$i++;
}
@ -190,7 +190,7 @@ if (defined('SYSTEM_INSTALLATION')) {
* without a database name
*/
if (!$singleDbForm) { //otherwise just use the main one
Database::select_db($row_course['db_name']);
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
@ -200,9 +200,9 @@ if (defined('SYSTEM_INSTALLATION')) {
}
if ($only_test) {
Log::notice("Database::query(".$row_course['db_name'].",$query)");
Log::notice("iDatabase::query(".$row_course['db_name'].",$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In ".$row_course['db_name'].", executed: $query");
}
@ -219,11 +219,11 @@ if (defined('SYSTEM_INSTALLATION')) {
// Update correct page_id to wiki table, actually only store 0
$query = "SELECT id, reflink FROM $t_wiki";
$res_page = Database::query($query);
$res_page = iDatabase::query($query);
$wiki_id = $reflink = array();
if (Database::num_rows($res_page) > 0) {
while ($row_page = Database::fetch_row($res_page)) {
if (iDatabase::num_rows($res_page) > 0) {
while ($row_page = iDatabase::fetch_row($res_page)) {
$wiki_id[] = $row_page[0];
$reflink[] = $row_page[1];
}
@ -236,19 +236,19 @@ if (defined('SYSTEM_INSTALLATION')) {
foreach ($wiki_id as $key => $wiki_page) {
$pag_id = $reflink_flip[$reflink[$key]];
$sql= "UPDATE $t_wiki SET page_id='".($pag_id + 1)."' WHERE id = '$wiki_page'";
$res_update = Database::query($sql);
$res_update = iDatabase::query($sql);
}
}
// Insert page_id into wiki_conf table, actually this table is empty
$query = "SELECT DISTINCT page_id FROM $t_wiki ORDER BY page_id";
$myres_wiki = Database::query($query);
$myres_wiki = iDatabase::query($query);
if (Database::num_rows($myres_wiki) > 0) {
while ($row_wiki = Database::fetch_row($myres_wiki)) {
if (iDatabase::num_rows($myres_wiki) > 0) {
while ($row_wiki = iDatabase::fetch_row($myres_wiki)) {
$page_id = $row_wiki[0];
$query = "INSERT INTO ".$t_wiki_conf." (page_id, task, feedback1, feedback2, feedback3, fprogress1, fprogress2, fprogress3) VALUES ('".$page_id."','','','','','','','')";
$myres_wiki_conf = Database::query($query);
$myres_wiki_conf = iDatabase::query($query);
}
}

78
main/install/update-db-1.8.6.1-1.8.6.2.inc.php
Unescape View File

@ -87,12 +87,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm,$dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach ($m_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbNameForm,$query)");
Log::notice("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbNameForm, executed: $query");
}
@ -110,21 +110,21 @@ if (defined('SYSTEM_INSTALLATION')) {
FROM session_rel_course
ORDER BY id_session, course_code";
$res = Database::query($sql);
$res = iDatabase::query($sql);
if ($res === false) {
Log::error('Could not query session course coaches table: '.Database::error());
Log::error('Could not query session course coaches table: '.iDatabase::error());
} else {
// For each coach found, add him as a course coach in the
// session_rel_course_rel_user table
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
// Check whether coach is a student
$sql = "SELECT 1 FROM session_rel_course_rel_user
WHERE id_session='{$row[id_session]}' AND course_code='{$row[course_code]}' AND id_user='{$row[id_coach]}'";
$rs = Database::query($sql);
$rs = iDatabase::query($sql);
if (Database::num_rows($rs) > 0) {
if (iDatabase::num_rows($rs) > 0) {
$sql_upd = "UPDATE session_rel_course_rel_user SET status=2
WHERE id_session='{$row[id_session]}' AND course_code='{$row[course_code]}' AND id_user='{$row[id_coach]}'";
} else {
@ -132,10 +132,10 @@ if (defined('SYSTEM_INSTALLATION')) {
VALUES ('{$row[id_session]}','{$row[course_code]}','{$row[id_coach]}',2)";
}
$rs_coachs = Database::query($sql_ins);
$rs_coachs = iDatabase::query($sql_ins);
if ($rs_coachs === false) {
Log::error('Could not move course coach to new table: '.Database::error());
Log::error('Could not move course coach to new table: '.iDatabase::error());
}
}
@ -144,34 +144,34 @@ if (defined('SYSTEM_INSTALLATION')) {
// Remove duplicated rows for 'show_tutor_data' AND 'show_teacher_data' into settings_current table
$sql = "SELECT id FROM settings_current WHERE variable='show_tutor_data' ORDER BY id";
$rs_chk_id1 = Database::query($sql);
$rs_chk_id1 = iDatabase::query($sql);
if ($rs_chk_id1 === false) {
Log::error('Could not query settings_current ids table: '.Database::error());
Log::error('Could not query settings_current ids table: '.iDatabase::error());
} else {
$i = 1;
while ($row_id1 = Database::fetch_array($rs_chk_id1)) {
while ($row_id1 = iDatabase::fetch_array($rs_chk_id1)) {
$id = $row_id1['id'];
if ($i > 1) {
$sql_del = "DELETE FROM settings_current WHERE id = '$id'";
Database::query($sql_del);
iDatabase::query($sql_del);
}
$i++;
}
}
$sql = "SELECT id FROM settings_current WHERE variable='show_teacher_data' ORDER BY id";
$rs_chk_id2 = Database::query($sql);
$rs_chk_id2 = iDatabase::query($sql);
if ($rs_chk_id2 === false) {
Log::error('Could not query settings_current ids table: '.Database::error());
Log::error('Could not query settings_current ids table: '.iDatabase::error());
} else {
$i = 1;
while ($row_id2 = Database::fetch_array($rs_chk_id2)) {
while ($row_id2 = iDatabase::fetch_array($rs_chk_id2)) {
$id = $row_id2['id'];
if ($i > 1) {
$sql_del = "DELETE FROM settings_current WHERE id = '$id'";
Database::query($sql_del);
iDatabase::query($sql_del);
}
$i++;
}
@ -192,12 +192,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm,$dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach ($m_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbNameForm,$query)");
Log::notice("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbNameForm, executed: $query");
}
@ -220,12 +220,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbStatsForm, $dblist)) {
Log::error('Database '.$dbStatsForm.' was not found, skipping');
} else {
Database::select_db($dbStatsForm);
iDatabase::select_db($dbStatsForm);
foreach ($s_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbStatsForm,$query)");
Log::notice("iDatabase::query($dbStatsForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbStatsForm, executed: $query");
}
@ -246,13 +246,13 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbUserForm,$dblist)) {
Log::error('Database '.$dbUserForm.' was not found, skipping');
} else {
Database::select_db($dbUserForm);
iDatabase::select_db($dbUserForm);
foreach ($u_q_list as $query) {
if ($only_test){
Log::notice("Database::query($dbUserForm,$query)");
Log::notice("iDatabase::query($dbUserForm,$query)");
Log::notice("In $dbUserForm, executed: $query");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
}
}
}
@ -275,15 +275,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
$res = Database::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
iDatabase::select_db($dbNameForm);
$res = iDatabase::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.6.1-1.8.6.2.inc.php'); }
if (Database::num_rows($res) > 0) {
if (iDatabase::num_rows($res) > 0) {
$i = 0;
$list = array();
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
$list[] = $row;
$i++;
}
@ -294,7 +294,7 @@ if (defined('SYSTEM_INSTALLATION')) {
* without a database name
*/
if (!$singleDbForm) { //otherwise just use the main one
Database::select_db($row_course['db_name']);
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
@ -304,9 +304,9 @@ if (defined('SYSTEM_INSTALLATION')) {
}
if ($only_test) {
Log::error("Database::query(".$row_course['db_name'].",$query)");
Log::error("iDatabase::query(".$row_course['db_name'].",$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::error("In ".$row_course['db_name'].", executed: $query");
}
@ -323,16 +323,16 @@ if (defined('SYSTEM_INSTALLATION')) {
// Get all ids and update description_type field with them from course_description table
$sql_sel = "SELECT id FROM $t_course_description";
$rs_sel = Database::query($sql_sel);
$rs_sel = iDatabase::query($sql_sel);
if ($rs_sel === false) {
Log::error('Could not query course_description ids table: '.Database::error());
Log::error('Could not query course_description ids table: '.iDatabase::error());
} else {
if (Database::num_rows($rs_sel) > 0) {
while ($row_ids = Database::fetch_array($rs_sel)) {
if (iDatabase::num_rows($rs_sel) > 0) {
while ($row_ids = iDatabase::fetch_array($rs_sel)) {
$description_id = $row_ids['id'];
$sql_upd = "UPDATE $t_course_description SET description_type='$description_id' WHERE id='$description_id'";
Database::query($sql_upd);
iDatabase::query($sql_upd);
}
}
}

6
main/install/update-db-1.8.6.2-1.8.7.inc.php
Unescape View File

@ -254,7 +254,6 @@ if (defined('SYSTEM_INSTALLATION')) {
Log::error('Database ' . $dbStatsForm . ' was not found, skipping');
} else {
iDatabase::select_db($dbStatsForm);
Log::notice('Database: statistics');
foreach ($s_q_list as $query) {
if ($only_test) {
@ -272,14 +271,12 @@ if (defined('SYSTEM_INSTALLATION')) {
$tables = iDatabase::get_tables($dbStatsForm);
foreach ($tables as $table) {
$query = "ALTER TABLE `" . $table . "` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;";
Log::notice('Database: statistics, Table: '. $table);
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in ' . $query . ': ' . iDatabase::error());
}
}
$query = "ALTER DATABASE `" . $dbStatsForm . "` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;";
Log::notice('Database: statistics - change default char set');
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in ' . $query . ': ' . iDatabase::error());
@ -301,7 +298,6 @@ if (defined('SYSTEM_INSTALLATION')) {
//getting the type question id
$sql_question = "SELECT type FROM $my_course_db.quiz_question where id = $question_id";
Log::notice('Database: '. $my_course_db);
$res_question = iDatabase::query($sql_question);
$row = iDatabase::fetch_array($res_question);
$type = $row['type'];
@ -339,7 +335,6 @@ if (defined('SYSTEM_INSTALLATION')) {
Log::error('Database ' . $dbUserForm . ' was not found, skipping');
} else {
iDatabase::select_db($dbUserForm);
Log::notice('Database: user');
foreach ($u_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbUserForm,$query)");
@ -406,7 +401,6 @@ if (defined('SYSTEM_INSTALLATION')) {
if (!$singleDbForm) { // otherwise just use the main one
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
foreach ($c_q_list as $query) {
if ($singleDbForm) {

114
main/install/update-db-1.8.7-1.8.8.inc.php
Unescape View File

@ -87,17 +87,17 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach ($m_q_list as $query){
if ($only_test) {
Log::notice("Database::query($dbNameForm,$query)");
Log::notice("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbNameForm, executed: $query");
}
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -116,12 +116,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm,$dblist)) {
error_log('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach ($m_q_list as $query) {
if ($only_test) {
error_log("Database::query($dbNameForm,$query)");
error_log("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
error_log("In $dbNameForm, executed: $query");
}
@ -144,18 +144,18 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbStatsForm, $dblist)){
Log::error('Database '.$dbStatsForm.' was not found, skipping');
} else {
Database::select_db($dbStatsForm);
iDatabase::select_db($dbStatsForm);
foreach ($s_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbStatsForm,$query)");
Log::notice("iDatabase::query($dbStatsForm,$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In $dbStatsForm, executed: $query");
}
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -177,15 +177,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbUserForm,$dblist)) {
Log::error('Database '.$dbUserForm.' was not found, skipping');
} else {
Database::select_db($dbUserForm);
iDatabase::select_db($dbUserForm);
foreach ($u_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbUserForm,$query)");
Log::notice("iDatabase::query($dbUserForm,$query)");
Log::notice("In $dbUserForm, executed: $query");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -208,15 +208,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif(!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
$res = Database::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
iDatabase::select_db($dbNameForm);
$res = iDatabase::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.6.2-1.8.7.inc.php'); }
if (Database::num_rows($res) > 0) {
if (iDatabase::num_rows($res) > 0) {
$i = 0;
$list = array();
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
$list[] = $row;
$i++;
}
@ -227,7 +227,7 @@ if (defined('SYSTEM_INSTALLATION')) {
* without a database name
*/
if (!$singleDbForm) { // otherwise just use the main one
Database::select_db($row_course['db_name']);
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
@ -237,14 +237,14 @@ if (defined('SYSTEM_INSTALLATION')) {
}
if ($only_test) {
Log::notice("Database::query(".$row_course['db_name'].",$query)");
Log::notice("iDatabase::query(".$row_course['db_name'].",$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In ".$row_course['db_name'].", executed: $query");
}
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -264,35 +264,35 @@ if (defined('SYSTEM_INSTALLATION')) {
$query = "SELECT DISTINCT path as exercise_id, lp_item_id, lp_view_id, user_id, v.lp_id
FROM $table_lp_item_view iv INNER JOIN $table_lp_view v ON v.id = iv.lp_view_id INNER JOIN $table_lp_item i ON i.id = lp_item_id
WHERE item_type = 'quiz'";
$result = Database::query($query);
$result = iDatabase::query($query);
if (Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result,'ASSOC')) {
if (iDatabase::num_rows($result) > 0) {
while ($row = iDatabase::fetch_array($result,'ASSOC')) {
$sql = "SELECT exe_id FROM $dbNameForm.track_e_exercices
WHERE exe_user_id = {$row['user_id']} AND
exe_cours_id = '{$row_course['code']}' AND
exe_exo_id = {$row['exercise_id']} AND
orig_lp_id = {$row['lp_id']} AND
orig_lp_item_id = {$row['lp_item_id']} ";
$sub_result = Database::query($sql);
$sub_result = iDatabase::query($sql);
$exe_list = array();
while ($sub_row = Database::fetch_array($sub_result,'ASSOC')) {
while ($sub_row = iDatabase::fetch_array($sub_result,'ASSOC')) {
$exe_list[] = $sub_row['exe_id'];
}
$sql = "SELECT iv.id, iv.view_count
FROM $table_lp_item_view iv INNER JOIN $table_lp_view v ON v.id = iv.lp_view_id INNER JOIN $table_lp_item i ON i.id = lp_item_id
WHERE item_type = 'quiz' AND user_id = {$row['user_id']} AND path = {$row['exercise_id']} ";
$sub_result = Database::query($sql);
$sub_result = iDatabase::query($sql);
$lp_item_view_id_list = array();
while ($sub_row = Database::fetch_array($sub_result,'ASSOC')) {
while ($sub_row = iDatabase::fetch_array($sub_result,'ASSOC')) {
$lp_item_view_id_list[] = $sub_row['id'];
}
$i = 0;
foreach($exe_list as $exe_id) {
$lp_item_view_id = $lp_item_view_id_list[$i];
$update = "UPDATE $dbNameForm.track_e_exercices SET orig_lp_item_view_id = '$lp_item_view_id' WHERE exe_id = $exe_id ";
Database::query($update);
iDatabase::query($update);
$i++;
}
}
@ -303,49 +303,49 @@ if (defined('SYSTEM_INSTALLATION')) {
//Adding notifications options
$sql = "INSERT INTO $dbNameForm.user_field (field_type, field_variable, field_display_text, field_visible, field_changeable, field_default_value) values (4, 'mail_notify_invitation', 'MailNotifyInvitation',1,1,'1') ";
$result = Database::query($sql);
$id = Database::insert_id();
$result = iDatabase::query($sql);
$id = iDatabase::insert_id();
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '1', 'AtOnce',1) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '8', 'Daily',2) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '0', 'No',3) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field (field_type, field_variable, field_display_text, field_visible, field_changeable, field_default_value) values (4, 'mail_notify_message', 'MailNotifyMessage',1,1,'1')";
$result = Database::query($sql);
$id = Database::insert_id();
$result = iDatabase::query($sql);
$id = iDatabase::insert_id();
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '1', 'AtOnce',1) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '8', 'Daily',2) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '0', 'No',3) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field (field_type, field_variable, field_display_text, field_visible, field_changeable, field_default_value) values (4, 'mail_notify_group_message','MailNotifyGroupMessage',1,1,'1') ";
$result = Database::query($sql);
$id = Database::insert_id();
$result = iDatabase::query($sql);
$id = iDatabase::insert_id();
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '1', 'AtOnce',1) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '8', 'Daily',2) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$sql = "INSERT INTO $dbNameForm.user_field_options (field_id, option_value, option_display_text, option_order) values ($id, '0', 'No',3) ";
$result = Database::query($sql);
$result = iDatabase::query($sql);
//Fixing table access_url_rel_course if the platform have courses that were created in Dok€os 1.8.5
if (!isset($_configuration['multiple_access_urls']) || $_configuration['multiple_access_urls'] == false) {
$sql = "SELECT code FROM $dbNameForm.course";
$result = Database::query($sql);
while ($row = Database::fetch_array($result)) {
$result = iDatabase::query($sql);
while ($row = iDatabase::fetch_array($result)) {
//Adding course to default URL just in case
$sql = "INSERT INTO $dbNameForm.access_url_rel_course SET course_code = '".Database::escape_string($row['code'])."', access_url_id = '1' ";
Database::query($sql);
$sql = "INSERT INTO $dbNameForm.access_url_rel_course SET course_code = '".iDatabase::escape_string($row['code'])."', access_url_id = '1' ";
iDatabase::query($sql);
}
}
}
@ -366,12 +366,12 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
$res = Database::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL");
iDatabase::select_db($dbNameForm);
$res = iDatabase::query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.7-1.8.8.inc.php'); }
if (Database::num_rows($res) > 0) {
if (iDatabase::num_rows($res) > 0) {
$i = 0;
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
$list[] = $row;
$i++;
}
@ -383,7 +383,7 @@ if (defined('SYSTEM_INSTALLATION')) {
if ($singleDbForm) {
$prefix_course = $prefix.$row['db_name']."_";
} else {
Database::select_db($row['db_name']);
iDatabase::select_db($row['db_name']);
}
foreach($c_q_list as $query) {
@ -391,9 +391,9 @@ if (defined('SYSTEM_INSTALLATION')) {
$query = preg_replace('/^(UPDATE|ALTER TABLE|CREATE TABLE|DROP TABLE|INSERT INTO|DELETE FROM)\s+(\w*)(.*)$/', "$1 $prefix$2$3", $query);
}
if ($only_test) {
Log::notice("Database::query(".$row['db_name'].",$query)");
Log::notice("iDatabase::query(".$row['db_name'].",$query)");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($log) {
Log::notice("In ".$row['db_name'].", executed: $query");
}

78
main/install/update-db-1.8.8-1.9.0.inc.php
Unescape View File

@ -56,7 +56,6 @@ if (defined('SYSTEM_INSTALLATION')) {
// If this script has been included by index.php, not update_courses.php, so
// that we want to change the main databases as well...
$only_test = false;
$log = 0;
if (defined('SYSTEM_INSTALLATION')) {
if ($singleDbForm) {
$dbStatsForm = $dbNameForm;
@ -85,17 +84,14 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
foreach ($m_q_list as $query){
if ($only_test) {
Log::notice("Database::query($dbNameForm,$query)");
Log::notice("iDatabase::query($dbNameForm,$query)");
} else {
$res = Database::query($query);
if ($log) {
Log::notice("In $dbNameForm, executed: $query");
}
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -115,18 +111,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbStatsForm, $dblist)){
Log::error('Database '.$dbStatsForm.' was not found, skipping');
} else {
Database::select_db($dbStatsForm);
iDatabase::select_db($dbStatsForm);
foreach ($s_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbStatsForm,$query)");
Log::notice("iDatabase::query($dbStatsForm,$query)");
} else {
$res = Database::query($query);
if ($log) {
Log::notice("In $dbStatsForm, executed: $query");
}
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -165,12 +158,12 @@ if (defined('SYSTEM_INSTALLATION')) {
);
if ($dbNameForm != $dbStatsForm) {
Database::select_db($dbStatsForm);
iDatabase::select_db($dbStatsForm);
foreach($stats_table as $stat_table) {
$sql = "ALTER TABLE $dbStatsForm.$stat_table RENAME $dbNameForm.$stat_table";
Database::query($sql);
iDatabase::query($sql);
}
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
}
@ -188,15 +181,15 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif (!in_array($dbUserForm,$dblist)) {
Log::error('Database '.$dbUserForm.' was not found, skipping');
} else {
Database::select_db($dbUserForm);
iDatabase::select_db($dbUserForm);
foreach ($u_q_list as $query) {
if ($only_test) {
Log::notice("Database::query($dbUserForm,$query)");
Log::notice("iDatabase::query($dbUserForm,$query)");
Log::notice("In $dbUserForm, executed: $query");
} else {
$res = Database::query($query);
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -212,12 +205,12 @@ if (defined('SYSTEM_INSTALLATION')) {
);
if ($dbNameForm != $dbUserForm) {
Database::select_db($dbUserForm);
iDatabase::select_db($dbUserForm);
foreach($users_table as $table) {
$sql = "ALTER TABLE $dbUserForm.$table RENAME $dbNameForm.$table";
Database::query($sql);
iDatabase::query($sql);
}
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
}
}
@ -243,17 +236,17 @@ if (defined('SYSTEM_INSTALLATION')) {
} elseif(!in_array($dbNameForm, $dblist)) {
Log::error('Database '.$dbNameForm.' was not found, skipping');
} else {
Database::select_db($dbNameForm);
$res = Database::query("SELECT id, code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
iDatabase::select_db($dbNameForm);
$res = iDatabase::query("SELECT id, code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
if ($res === false) { die('Error while querying the courses list in update_db-1.8.6.2-1.8.7.inc.php'); }
$errors = array();
if (Database::num_rows($res) > 0) {
if (iDatabase::num_rows($res) > 0) {
$i = 0;
$list = array();
while ($row = Database::fetch_array($res)) {
while ($row = iDatabase::fetch_array($res)) {
$list[] = $row;
$i++;
}
@ -262,7 +255,7 @@ if (defined('SYSTEM_INSTALLATION')) {
// Now use the $c_q_list
if (!$singleDbForm) { // otherwise just use the main one
Database::select_db($row_course['db_name']);
iDatabase::select_db($row_course['db_name']);
}
Log::notice('Course db ' . $row_course['db_name']);
@ -271,14 +264,11 @@ if (defined('SYSTEM_INSTALLATION')) {
$query = preg_replace('/^(UPDATE|ALTER TABLE|CREATE TABLE|DROP TABLE|INSERT INTO|DELETE FROM)\s+(\w*)(.*)$/', "$1 $prefix{$row_course['db_name']}_$2$3", $query);
}
if ($only_test) {
Log::notice("Database::query(".$row_course['db_name'].",$query)");
Log::notice("iDatabase::query(".$row_course['db_name'].",$query)");
} else {
$res = Database::query($query);
if ($log) {
Log::notice("In ".$row_course['db_name'].", executed: $query");
}
$res = iDatabase::query($query);
if ($res === false) {
Log::error('Error in '.$query.': '.Database::error());
Log::error('Error in '.$query.': '.iDatabase::error());
}
}
}
@ -388,18 +378,18 @@ if (defined('SYSTEM_INSTALLATION')) {
if (!$singleDbForm) {
// otherwise just use the main one
Database::select_db($row_course['db_name']);
iDatabase::select_db($row_course['db_name']);
} else {
Database::select_db($dbNameForm);
iDatabase::select_db($dbNameForm);
}
//Count of rows
$sql = "SELECT count(*) FROM $old_table";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$old_count = 0;
if ($result) {
$row = Database::fetch_row($result);
$row = iDatabase::fetch_row($result);
$old_count = $row[0];
} else {
Log::error("Seems that the table $old_table doesn't exists ");
@ -407,13 +397,13 @@ if (defined('SYSTEM_INSTALLATION')) {
Log::notice("# rows in $old_table: $old_count");
$sql = "SELECT * FROM $old_table";
$result = Database::query($sql);
$result = iDatabase::query($sql);
$count = 0;
while($row = Database::fetch_array($result, 'ASSOC')) {
while($row = iDatabase::fetch_array($result, 'ASSOC')) {
$row['c_id'] = $course_id;
Database::select_db($dbNameForm);
$id = Database::insert($new_table, $row);
iDatabase::select_db($dbNameForm);
$id = iDatabase::insert($new_table, $row);
if (is_numeric($id)) {
$count++;
} else {

10
main/install/update-files-1.8.5-1.8.6.inc.php
Unescape View File

@ -58,16 +58,16 @@ if (defined('SYSTEM_INSTALLATION')) {
//$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
//// Linking (The following line is disabled, connection has been already done)
//$res = @Database::connect(array('server' => $dbHostForm, 'username' => $dbUsernameForm, 'password' => $dbPassForm));
//Database::select_db($dbNameForm, $link);
Database::select_db($dbNameForm);
//$res = @iDatabase::connect(array('server' => $dbHostForm, 'username' => $dbUsernameForm, 'password' => $dbPassForm));
//iDatabase::select_db($dbNameForm, $link);
iDatabase::select_db($dbNameForm);
$db_name = $dbNameForm;
$sql = "SELECT * FROM $db_name.course";
Log::notice('Getting courses for files updates: ' . $sql);
$result = Database::query($sql);
$result = iDatabase::query($sql);
while ($courses_directories = Database::fetch_array($result)) {
while ($courses_directories = iDatabase::fetch_array($result)) {
$currentCourseRepositorySys = $sys_course_path . $courses_directories['directory'] . '/';

12
main/install/update-files-1.8.6.1-1.8.6.2.inc.php
Unescape View File

@ -53,17 +53,17 @@ if (defined('SYSTEM_INSTALLATION')) {
$perm = api_get_permissions_for_new_directories();
// The following line is disabled, connection has been already done
//$link = Database::connect(array('server' => $dbHostForm, 'username' => $dbUsernameForm, 'password' => $dbPassForm));
//Database::select_db($dbNameForm, $link);
Database::select_db($dbNameForm);
//$link = iDatabase::connect(array('server' => $dbHostForm, 'username' => $dbUsernameForm, 'password' => $dbPassForm));
//iDatabase::select_db($dbNameForm, $link);
iDatabase::select_db($dbNameForm);
$db_name = $dbNameForm;
$sql = "SELECT * FROM $db_name.course";
Log::notice('Getting courses for files updates: ' . $sql);
$result = Database::query($sql);
$result = iDatabase::query($sql);
if (Database::num_rows($result) > 0) {
while ($courses_directories = Database::fetch_array($result)) {
if (iDatabase::num_rows($result) > 0) {
while ($courses_directories = iDatabase::fetch_array($result)) {
$currentCourseRepositorySys = $sys_course_path . $courses_directories['directory'] . '/';
// upload > announcements
if (!is_dir($currentCourseRepositorySys . "upload/announcements")) {

Write Preview
Loading…
Cancel
Save