From 10e30bf6b1652107f49a374f75fc0c01bee864cb Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 18 Feb 2010 01:13:34 +0200 Subject: [PATCH] Feature #272 - Installation scripts: Renaming files, removing the old brand. --- main/auth/courses.php | 4 +-- main/calendar/myagenda.inc.php | 2 +- main/calendar/myagenda.php | 2 +- main/install/{dokeos_main.sql => db_main.sql} | 36 +++++++++---------- .../{dokeos_stats.sql => db_stats.sql} | 0 main/install/{dokeos_user.sql => db_user.sql} | 0 main/install/install.lib.php | 2 +- main/install/install_db.inc.php | 4 +-- .../main/install/install_upgrade.lib.test.php | 4 +-- 9 files changed, 27 insertions(+), 27 deletions(-) rename main/install/{dokeos_main.sql => db_main.sql} (99%) mode change 100755 => 100644 rename main/install/{dokeos_stats.sql => db_stats.sql} (100%) mode change 100755 => 100644 rename main/install/{dokeos_user.sql => db_user.sql} (100%) mode change 100755 => 100644 diff --git a/main/auth/courses.php b/main/auth/courses.php index 451308a38b..61feb7896b 100755 --- a/main/auth/courses.php +++ b/main/auth/courses.php @@ -593,7 +593,7 @@ function delete_course_category($id) { } /** - * stores the user course category in the dokeos_user database + * stores the user course category in the chamilo_user database * @author Patrick Cool , Ghent University * @return string a language variable saying that the user course category was stored */ @@ -1207,7 +1207,7 @@ function display_edit_course_category_form($edit_course_category) { } /** - * Updates the user course category in the dokeos_user database + * Updates the user course category in the chamilo_user database * @author Patrick Cool , Ghent University * @return string a language variable saying that the user course category was stored */ diff --git a/main/calendar/myagenda.inc.php b/main/calendar/myagenda.inc.php index 95d98e799d..e2d76f801a 100755 --- a/main/calendar/myagenda.inc.php +++ b/main/calendar/myagenda.inc.php @@ -12,7 +12,7 @@ ------------- -> version 2.2 : Patrick Cool, patrick.cool@ugent.be, november 2004 Personal Agenda added. The user can add personal agenda items. The items - are stored in a dokeos_user database because it is not course or platform + are stored in a chamilo_user database because it is not course or platform based. A personal agenda view was also added. This lists all the personal agenda items of that user. diff --git a/main/calendar/myagenda.php b/main/calendar/myagenda.php index 7e0571f7f4..6c933145c8 100755 --- a/main/calendar/myagenda.php +++ b/main/calendar/myagenda.php @@ -31,7 +31,7 @@ Added repeated events -> version 2.2 : Patrick Cool, patrick.cool@ugent.be, november 2004 Personal Agenda added. The user can add personal agenda items. The items - are stored in a dokeos_user database because it is not course or platform + are stored in a chamilo_user database because it is not course or platform based. A personal agenda view was also added. This lists all the personal agenda items of that user. diff --git a/main/install/dokeos_main.sql b/main/install/db_main.sql old mode 100755 new mode 100644 similarity index 99% rename from main/install/dokeos_main.sql rename to main/install/db_main.sql index c8f4cb4988..189e621d02 --- a/main/install/dokeos_main.sql +++ b/main/install/db_main.sql @@ -1,6 +1,6 @@ -- MySQL dump 10.9 -- --- Host: localhost Database: dokeos_main +-- Host: localhost Database: chamilo_main -- ------------------------------------------------------ -- Server version 4.1.14 @@ -198,7 +198,7 @@ CREATE TABLE course_category ( /*!40000 ALTER TABLE course_category DISABLE KEYS */; LOCK TABLES course_category WRITE; -INSERT INTO course_category VALUES (1,'Language skills','LANG',NULL,1,0,'TRUE','TRUE'),(2,'PC Skills','PC',NULL,2,0,'TRUE','TRUE'),(3,'Projects','PROJ',NULL,3,0,'TRUE','TRUE'); +INSERT INTO course_category VALUES (1,'Language skills','LANG',NULL,1,0,'TRUE','TRUE'),(2,'PC Skills','PC',NULL,2,0,'TRUE','TRUE'),(3,'Projects','PROJ',NULL,3,0,'TRUE','TRUE'),(4,'Demo','DEMO',NULL,4,0,'TRUE','TRUE'); UNLOCK TABLES; /*!40000 ALTER TABLE course_category ENABLE KEYS */; @@ -243,7 +243,7 @@ CREATE TABLE course_field_values( DROP TABLE IF EXISTS course_module; CREATE TABLE course_module ( id int unsigned NOT NULL auto_increment, - name varchar(100) NOT NULL, + name varchar(255) NOT NULL, link varchar(255) NOT NULL, image varchar(100) default NULL, `row` int unsigned NOT NULL default '0', @@ -369,48 +369,48 @@ LOCK TABLES language WRITE; INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available) VALUES ('Arabija (el)','arabic','ar','arabic',0), ('Asturian','asturian','ast','asturian',0), -('Balgarski','bulgarian','bg','bulgarian',1), -('Bosanski','bosnian','bs','bosnian',1), +('Bulgarian','bulgarian','bg','bulgarian',1), +('Bosanski','bosnian','bs','bosnian',0), ('Català','catalan','ca','catalan',0), ('Chinese (simplified)','simpl_chinese','zh','simpl_chinese',0), ('Chinese (traditional)','trad_chinese','zh-TW','trad_chinese',0), ('Czech','czech','cs','czech',0), ('Dansk','danish','da','danish',0), ('Dari','dari','prs','dari',0), -('Deutsch','german','de','german',1), +('Deutsch','german','de','german',0), ('Ellinika','greek','el','greek',0), ('English','english','en','english',1), -('Español','spanish','es','spanish',1), +('Español','spanish','es','spanish',0), ('Esperanto','esperanto','eo','esperanto',0), ('Euskara','euskera','eu','euskera',0), ('Farsi','persian','fa','persian',0), -('Français','french','fr','french',1), +('Français','french','fr','french',0), ('Friulian','friulian','fur','friulian',0), ('Galego','galician','gl','galician',0), ('Georgian','georgian','ka','georgian',0), ('Hrvatski','croatian','hr','croatian',0), ('Hebrew','hebrew','he','hebrew',0), -('Indonesia (Bahasa I.)','indonesian','id','indonesian',1), -('Italiano','italian','it','italian',1), +('Indonesia (Bahasa I.)','indonesian','id','indonesian',0), +('Italiano','italian','it','italian',0), ('Korean','korean','ko','korean',0), ('Latvian','latvian','lv','latvian',0), ('Lithuanian','lithuanian','lt','lithuanian',0), ('Macedonian','macedonian','mk','macedonian',0), -('Magyar','hungarian','hu','hungarian',1), +('Magyar','hungarian','hu','hungarian',0), ('Melayu (Bahasa M.)','malay','ms','malay',0), -('Nederlands','dutch','nl','dutch',1), +('Nederlands','dutch','nl','dutch',0), ('Nihongo','japanese','ja','japanese',0), ('Norsk','norwegian','no','norwegian',0), ('Occitan','occitan','oc','occitan',0), ('Pashto','pashto','ps','pashto',0), ('Polski','polish','pl','polish',0), -('Português (Portugal)','portuguese','pt','portuguese',1), -('Português (Brazil)','brazilian','pt-BR','brazilian',1), +('Português (Portugal)','portuguese','pt','portuguese',0), +('Português (Brazil)','brazilian','pt-BR','brazilian',0), ('Romanian','romanian','ro','romanian',0), ('Runasimi','quechua_cusco','qu','quechua_cusco',0), ('Russkij','russian','ru','russian',0), ('Slovak','slovak','sk','slovak',0), -('Slovenscina','slovenian','sl','slovenian',1), +('Slovenscina','slovenian','sl','slovenian',0), ('Srpski','serbian','sr','serbian',0), ('Suomi','finnish','fi','finnish',0), ('Svenska','swedish','sv','swedish',0), @@ -1263,7 +1263,7 @@ CREATE TABLE access_url_rel_session ( -- CREATE TABLE IF NOT EXISTS sys_calendar ( id int unsigned NOT NULL auto_increment, - title varchar(200) NOT NULL, + title varchar(255) NOT NULL, content text, start_date datetime NOT NULL default '0000-00-00 00:00:00', end_date datetime NOT NULL default '0000-00-00 00:00:00', @@ -2310,7 +2310,7 @@ CREATE TABLE session_category ( CREATE TABLE tag ( id int NOT NULL auto_increment, - tag char(80) NOT NULL, + tag varchar(255) NOT NULL, field_id int NOT NULL, count int NOT NULL, PRIMARY KEY (id) @@ -2320,7 +2320,7 @@ CREATE TABLE tag ( CREATE TABLE user_rel_tag ( id int NOT NULL auto_increment, user_id int NOT NULL, - tag_id int NOT NULL, + tag_id int NOT NULL, PRIMARY KEY (id) ); diff --git a/main/install/dokeos_stats.sql b/main/install/db_stats.sql old mode 100755 new mode 100644 similarity index 100% rename from main/install/dokeos_stats.sql rename to main/install/db_stats.sql diff --git a/main/install/dokeos_user.sql b/main/install/db_user.sql old mode 100755 new mode 100644 similarity index 100% rename from main/install/dokeos_user.sql rename to main/install/db_user.sql diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 71ab89daa6..26775ec8ee 100644 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -18,7 +18,7 @@ ============================================================================== */ -define('SYSTEM_MAIN_DATABASE_FILE', 'dokeos_main.sql'); +define('SYSTEM_MAIN_DATABASE_FILE', 'db_main.sql'); define('COUNTRY_DATA_FILENAME', 'country_data.csv'); define('COURSES_HTACCESS_FILENAME', 'htaccess.dist'); define('SYSTEM_CONFIG_FILENAME', 'configuration.dist.php'); diff --git a/main/install/install_db.inc.php b/main/install/install_db.inc.php index 7d8d2b0e6f..8e8e99cd5f 100755 --- a/main/install/install_db.inc.php +++ b/main/install/install_db.inc.php @@ -144,7 +144,7 @@ load_main_database($installation_settings); Database::select_db($mysqlStatsDb) or die(Database::error()); -load_database_script('dokeos_stats.sql'); +load_database_script('db_stats.sql'); $track_countries_table = "track_c_countries"; fill_track_countries_table($track_countries_table); @@ -156,4 +156,4 @@ fill_track_countries_table($track_countries_table); Database::select_db($mysqlUserDb) or die(Database::error()); -load_database_script('dokeos_user.sql'); +load_database_script('db_user.sql'); diff --git a/tests/main/install/install_upgrade.lib.test.php b/tests/main/install/install_upgrade.lib.test.php index 4dd27e6b44..c81af954a1 100755 --- a/tests/main/install/install_upgrade.lib.test.php +++ b/tests/main/install/install_upgrade.lib.test.php @@ -52,14 +52,14 @@ class TestInstallUpgrade extends UnitTestCase{ $installation_settings['{PLATFORM_AUTH_SOURCE}'] = PLATFORM_AUTH_SOURCE; $installation_settings['{ADMINLANGUAGE}'] = 'spanish'; $installation_settings['{HASHFUNCTIONMODE}'] = 'md5'; - $db_script = $chamilo_path_folder.'install/dokeos_main.sql'; + $db_script = $chamilo_path_folder.'install/db_main.sql'; $res = load_main_database($installation_settings,$db_script); $this->assertFalse($res); } */ public function testLoadDatabaseScript() { $chamilo_path_folder= api_get_path(SYS_PATH); - $db_script= $chamilo_path_folder.'main/install/dokeos_stats.sql'; + $db_script= $chamilo_path_folder.'main/install/db_stats.sql'; $res = load_database_script($db_script); $this->assertTrue(is_null($res)); }