Yannick Warnier 15 жил өмнө
parent
commit
171e389d85

+ 1 - 1
main/install/dokeos_main.sql

@@ -735,7 +735,7 @@ VALUES
 ('show_courses_descriptions_in_catalog', NULL, 'radio', 'Course', 'true', 'ShowCoursesDescriptionsInCatalogTitle', 'ShowCoursesDescriptionsInCatalogComment', NULL, NULL, 1),
 ('allow_coach_to_edit_course_session',NULL,'radio','Course','false','AllowCoachsToEditInsideTrainingSessions','AllowCoachsToEditInsideTrainingSessionsComment',NULL,NULL, 0),
 ('show_glossary_in_extra_tools', NULL, 'radio', 'Course', 'false', 'ShowGlossaryInExtraToolsTitle', 'ShowGlossaryInExtraToolsComment', NULL, NULL,1),
-('dokeos_database_version', NULL, 'textfield', NULL,'1.8.6.2.9928','DokeosDatabaseVersion','',NULL,NULL,0),
+('dokeos_database_version', NULL, 'textfield', NULL,'1.8.7.10004','DokeosDatabaseVersion','',NULL,NULL,0),
 ('send_email_to_admin_when_create_course',NULL,'radio','Platform','false','SendEmailToAdminTitle','SendEmailToAdminComment',NULL,NULL, 1),
 ('go_to_course_after_login',NULL,'radio','Course','false','GoToCourseAfterLoginTitle','GoToCourseAfterLoginComment',NULL,NULL, 0),
 ('math_mimetex',NULL,'radio','Editor','false','MathMimetexTitle','MathMimetexComment',NULL,NULL, 0),

+ 1 - 1
main/install/index.php

@@ -788,7 +788,7 @@ elseif($_POST['step6'])
                 include('update-files-1.8.6.1-1.8.6.2.inc.php');
             case '1.8.6.2':
                 include('update-db-1.8.6.2-1.8.7.inc.php');
-                include('update-files-1.8.6.2-1.8.7.inc.php');
+                //include('update-files-1.8.6.2-1.8.7.inc.php');
             default:
 				break;
 		}

+ 2 - 3
main/install/migrate-db-1.8.6.2-1.8.7-pre.sql

@@ -15,7 +15,7 @@
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('course_create_active_tools','notebook','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Notebook',1,0);
 INSERT INTO course_module (name, link, image, `row`, `column`, position) VALUES ('notebook','notebook/index.php','notebook.gif',2,1,'basic');
 
-
+UPDATE settings_current SET selected_value = '1.8.7.10004' WHERE variable = 'dokeos_database_version';
 
 -- xxSTATSxx
 
@@ -23,5 +23,4 @@ INSERT INTO course_module (name, link, image, `row`, `column`, position) VALUES
 
 -- xxCOURSExx
 
-INSERT INTO tool(name,link,image,visibility,admin,address,added_tool,target,category) VALUES ('notebook','notebook/index.php','notebook.gif',0,'0','squaregrey.gif',0,'_self','interaction');
-
+INSERT INTO tool(name,link,image,visibility,admin,address,added_tool,target,category) VALUES ('notebook','notebook/index.php','notebook.gif',0,'0','squaregrey.gif',0,'_self','interaction');

+ 313 - 5
main/install/update-db-1.8.6.2-1.8.7.inc.php

@@ -24,23 +24,331 @@ $new_file_version = '1.8.7';
 //remove memory and time limits as much as possible as this might be a long process...
 if(function_exists('ini_set'))
 {
-	ini_set('memory_limit',-1);
-	ini_set('max_execution_time',0);
+    ini_set('memory_limit',-1);
+    ini_set('max_execution_time',0);
 }else{
-	error_log('Update-db script: could not change memory and time limits',0);
+    error_log('Update-db script: could not change memory and time limits',0);
 }
 
 /*
 ==============================================================================
-		MAIN CODE
+        MAIN CODE
 ==============================================================================
 */
 
 //check if we come from index.php or update_courses.php - otherwise display error msg
 if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
 {
+    //check if the current Dokeos install is elligible for update
+    if (!file_exists('../inc/conf/configuration.php'))
+    {
+        echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
+                                '.get_lang('PleasGoBackToStep1').'.
+                                <p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
+                                </td></tr></table></form></body></html>';
+
+        exit ();
+    }
+
+    //get_config_param() comes from install_functions.inc.php and
+    //actually gets the param from
+    $_configuration['db_glue'] = get_config_param('dbGlu');
+
+    if ($singleDbForm)
+    {
+        $_configuration['table_prefix'] = get_config_param('courseTablePrefix');
+        $_configuration['main_database'] = get_config_param('mainDbName');
+        $_configuration['db_prefix'] = get_config_param('dbNamePrefix');
+    }
+
+    $dbScormForm = eregi_replace('[^a-z0-9_-]', '', $dbScormForm);
+
+    if (!empty ($dbPrefixForm) && !ereg('^'.$dbPrefixForm, $dbScormForm))
+    {
+        $dbScormForm = $dbPrefixForm.$dbScormForm;
+    }
+
+    if (empty ($dbScormForm) || $dbScormForm == 'mysql' || $dbScormForm == $dbPrefixForm)
+    {
+        $dbScormForm = $dbPrefixForm.'scorm';
+    }
+    $res = @mysql_connect($dbHostForm, $dbUsernameForm, $dbPassForm);
+
+    //if error on connection to the database, show error and exit
+    if ($res === false)
+    {
+        //$no = mysql_errno();
+        //$msg = mysql_error();
+
+        //echo '<hr>['.$no.'] - '.$msg.'<hr>';
+        echo                    get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
+                '               '.get_lang('PleaseCheckTheseValues').' :<br /><br />
+                                <b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
+                                <b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
+                                <b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
+                                '.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
+                                <p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
+                                </td></tr></table></form></body></html>';
+
+        exit ();
+    }
+
+    // The Dokeos system has not been designed to use special SQL modes that were introduced since MySQL 5
+    @mysql_query("set session sql_mode='';");
+
+    $dblistres = mysql_list_dbs();
+    $dblist = array();
+    while ($row = mysql_fetch_object($dblistres)) {
+        $dblist[] = $row->Database;
+    }
+    /*
+    -----------------------------------------------------------
+        Normal upgrade procedure:
+        start by updating main, statistic, user databases
+    -----------------------------------------------------------
+    */
+    //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('DOKEOS_INSTALL'))
+    {
+        if ($singleDbForm)
+        {
+            $dbStatsForm = $dbNameForm;
+            $dbScormForm = $dbNameForm;
+            $dbUserForm = $dbNameForm;
+        }
+        /**
+         * Update the databases "pre" migration
+         */
+        include ("../lang/english/create_course.inc.php");
+
+        if ($languageForm != 'english')
+        {
+            //languageForm has been escaped in index.php
+            include ("../lang/$languageForm/create_course.inc.php");
+        }
+
+        //get the main queries list (m_q_list)
+        $m_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','main');
+        if(count($m_q_list)>0)
+        {
+            //now use the $m_q_list
+            /**
+             * We connect to the right DB first to make sure we can use the queries
+             * without a database name
+             */
+            if(strlen($dbNameForm)>40){
+                error_log('Database name '.$dbNameForm.' is too long, skipping',0);
+            }elseif(!in_array($dbNameForm,$dblist)){
+                error_log('Database '.$dbNameForm.' was not found, skipping',0);
+            }else{
+                mysql_select_db($dbNameForm);
+                foreach($m_q_list as $query){
+                    if($only_test){
+                        error_log("mysql_query($dbNameForm,$query)",0);
+                    }else{
+                        $res = mysql_query($query);
+                        if($log)
+                        {
+                            error_log("In $dbNameForm, executed: $query",0);
+                        }
+                        if ($res === false) {
+                        	error_log('Error in '.$query.': '.mysql_error());
+                        }
+                    }
+                }
+            }
+        }
+        //
+        
+        
+        // now clean the deprecated id_coach field from the session_rel_course 
+        // table 
+        /*
+        $m_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-post.sql','main');
+        if(count($m_q_list)>0)
+        {
+            //now use the $m_q_list
+            // We connect to the right DB first to make sure we can use the queries
+            // without a database name
+            if(strlen($dbNameForm)>40){
+                error_log('Database name '.$dbNameForm.' is too long, skipping',0);
+            }elseif(!in_array($dbNameForm,$dblist)){
+                error_log('Database '.$dbNameForm.' was not found, skipping',0);
+            }else{
+                mysql_select_db($dbNameForm);
+                foreach($m_q_list as $query){
+                    if($only_test){
+                        error_log("mysql_query($dbNameForm,$query)",0);
+                    }else{
+                        $res = mysql_query($query);
+                        if($log)
+                        {
+                            error_log("In $dbNameForm, executed: $query",0);
+                        }
+                    }
+                }
+            }
+        }
+        */
+        
+        //get the stats queries list (s_q_list)
+        $s_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','stats');
+
+        if(count($s_q_list)>0)
+        {
+            //now use the $s_q_list
+            /**
+             * We connect to the right DB first to make sure we can use the queries
+             * without a database name
+             */
+            if(strlen($dbStatsForm)>40){
+                error_log('Database name '.$dbStatsForm.' is too long, skipping',0);
+            }elseif(!in_array($dbStatsForm,$dblist)){
+                error_log('Database '.$dbStatsForm.' was not found, skipping',0);
+            }else{
+                mysql_select_db($dbStatsForm);
+                foreach($s_q_list as $query){
+                    if($only_test){
+                        error_log("mysql_query($dbStatsForm,$query)",0);
+                    }else{
+                        $res = mysql_query($query);
+                        if($log)
+                        {
+                            error_log("In $dbStatsForm, executed: $query",0);
+                        }
+                        if ($res === false) {
+                            error_log('Error in '.$query.': '.mysql_error());
+                        }
+                    }
+                }
+            }
+        }
+        //get the user queries list (u_q_list)
+        $u_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','user');
+        if(count($u_q_list)>0)
+        {
+            //now use the $u_q_list
+            /**
+             * We connect to the right DB first to make sure we can use the queries
+             * without a database name
+             */
+            if(strlen($dbUserForm)>40){
+                error_log('Database name '.$dbUserForm.' is too long, skipping',0);
+            }elseif(!in_array($dbUserForm,$dblist)){
+                error_log('Database '.$dbUserForm.' was not found, skipping',0);
+            }else{
+                mysql_select_db($dbUserForm);
+                foreach($u_q_list as $query){
+                    if($only_test){
+                        error_log("mysql_query($dbUserForm,$query)",0);
+                        error_log("In $dbUserForm, executed: $query",0);
+                    }else{
+                        $res = mysql_query($query);
+                        if ($res === false) {
+                            error_log('Error in '.$query.': '.mysql_error());
+                        }
+                    }
+                }
+            }
+        }
+        //the SCORM database doesn't need a change in the pre-migrate part - ignore
+    }
+
+
+    /*
+    -----------------------------------------------------------
+        Update the Dokeos course databases
+        this part can be accessed in two ways:
+        - from the normal upgrade process
+        - from the script update_courses.php,
+        which is used to upgrade more than MAX_COURSE_TRANSFER courses
+
+        Every time this script is accessed, only
+        MAX_COURSE_TRANSFER courses are upgraded.
+    -----------------------------------------------------------
+    */
+
+    $prefix = '';
+    if ($singleDbForm)
+    {
+        $prefix =  get_config_param ('table_prefix');
+    }
+
+    //get the courses databases queries list (c_q_list)
+    $c_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','course');
+
+    if(count($c_q_list)>0)
+    {
+        //get the courses list
+        if(strlen($dbNameForm)>40)
+        {
+            error_log('Database name '.$dbNameForm.' is too long, skipping',0);
+        }
+        elseif(!in_array($dbNameForm,$dblist))
+        {
+            error_log('Database '.$dbNameForm.' was not found, skipping',0);
+        }
+        else
+        {
+            mysql_select_db($dbNameForm);
+            $res = mysql_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.inc.php');}
+
+            if(mysql_num_rows($res)>0)
+            {
+                $i=0;
+                $list = array();
+                //while( ($i < MAX_COURSE_TRANSFER) && ($row = mysql_fetch_array($res)))
+                while($row = mysql_fetch_array($res))
+                {
+                    $list[] = $row;
+                    $i++;
+                }
+                foreach($list as $row_course)
+                {
+                    //now use the $c_q_list
+                    /**
+                     * We connect to the right DB first to make sure we can use the queries
+                     * without a database name
+                     */
+                    if (!$singleDbForm) //otherwise just use the main one
+                    {
+                        mysql_select_db($row_course['db_name']);
+                    }
+
+                    foreach($c_q_list as $query)
+                    {
+                        if ($singleDbForm) //otherwise just use the main one
+                        {
+                            $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)
+                        {
+                            error_log("mysql_query(".$row_course['db_name'].",$query)",0);
+                        }
+                        else
+                        {
+                            $res = mysql_query($query);
+                            if($log)
+                            {
+                                error_log("In ".$row_course['db_name'].", executed: $query",0);
+                            }
+                            if ($res === false) {
+                                error_log('Error in '.$query.': '.mysql_error());
+                            }
+                        }
+                    }                                                           
+                }
+            }
+        }
+    }
 }
 else
 {
-	echo 'You are not allowed here !';
+    echo 'You are not allowed here !';
 }