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

Format code, remove unused code.

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 798fae72ee
commit 82a63e9dac
3 changed files with 27 additions and 78 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. 28
      main/install/update-configuration.inc.php
  2. 15
      main/install/version.php
  3. 44
      tests/main/install/install_upgrade.lib.test.php

28
main/install/update-configuration.inc.php
Unescape View File

@ -1,11 +1,11 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
* Chamilo LMS
*
* Only updates the main/inc/conf/configuration.php file with the new version use only from 1.8.8.1 to 1.8.8.2 (with no DB changes)
* Only updates the main/inc/conf/configuration.php
* @package chamilo.install
*/
if (defined('SYSTEM_INSTALLATION')) {
@ -16,27 +16,19 @@ if (defined('SYSTEM_INSTALLATION')) {
$file = file(api_get_path(CONFIGURATION_PATH) . 'configuration.php');
$fh = fopen(api_get_path(CONFIGURATION_PATH) . 'configuration.php', 'w');
$found_version_old = false;
$found_stable_old = false;
$found_version = false;
$found_stable = false;
$found_software_name = false;
$found_software_url = false;
$found_version_old = false;
$found_stable_old = false;
$found_version = false;
$found_stable = false;
$found_software_name = false;
$found_software_url = false;
foreach ($file as $line) {
$ignore = false;
if (stripos($line, '$_configuration[\'dokeos_version\']') !== false) {
$found_version_old = true;
$line = '$_configuration[\'dokeos_version\'] = \'' . $new_version . '\';' . "\r\n";
$ignore = true;
} elseif (stripos($line, '$_configuration[\'system_version\']') !== false) {
if (stripos($line, '$_configuration[\'system_version\']') !== false) {
$found_version = true;
$line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
} elseif (stripos($line, '$_configuration[\'dokeos_stable\']') !== false) {
$found_stable_old = true;
$line = '$_configuration[\'dokeos_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
$ignore = true;
} elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
} elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
$found_stable = true;
$line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
} elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {

15
main/install/version.php
Unescape View File

@ -9,13 +9,14 @@
*
* @package chamilo.install
*/
/**
* Variables used from the main/install/index.php
*/
$new_version = '1.10.0';
$new_version_status = 'alpha';
$new_version_last_id = 0;
$new_version_stable = false;
$new_version_major = true;
$software_name = 'Chamilo';
$software_url = 'http://www.chamilo.org/';
$new_version = '1.10.0';
$new_version_status = 'alpha';
$new_version_last_id = 0;
$new_version_stable = false;
$new_version_major = true;
$software_name = 'Chamilo';
$software_url = 'http://www.chamilo.org/';

44
tests/main/install/install_upgrade.lib.test.php
Unescape View File

@ -15,13 +15,6 @@ class TestInstallUpgrade extends UnitTestCase{
//var_dump($res);
}
public function testFillTrackCountriesTable() {
$track_countries_table='';
$res = fill_track_countries_table($track_countries_table);
$this->assertEqual(null,$res);
//var_dump($res);
}
public function testWriteCoursesHtaccessFile() {
$chamilo_path_folder = api_get_path(SYS_PATH);
$url_append=$chamilo_path_folder.'main/install/';
@ -33,30 +26,6 @@ class TestInstallUpgrade extends UnitTestCase{
$this->assertEqual($chamilo_path_folder.'main/install/',$res);
//var_dump($res);
}
//This function is ok but the problem is than create course with other code
/*
public function testLoadMainDatabase() {
$chamilo_path_folder= api_get_path(SYS_CODE_PATH);
$installation_settings['{ORGANISATIONNAME}'] = 'My Organisation';
$installation_settings['{ORGANISATIONURL}'] = 'http://www.chamilo.org';
$installation_settings['{CAMPUSNAME}'] = 'My campus';
$installation_settings['{PLATFORMLANGUAGE}'] = 'spanish';
$installation_settings['{ALLOWSELFREGISTRATION}'] = 1;
$installation_settings['{ALLOWTEACHERSELFREGISTRATION}'] = 1;
$installation_settings['{ADMINLASTNAME}'] = 'Doe';
$installation_settings['{ADMINFIRSTNAME}'] = 'John';
$installation_settings['{ADMINLOGIN}'] = 'admin';
$installation_settings['{ADMINPASSWORD}'] = md5('admin');
$installation_settings['{ADMINEMAIL}'] = '.localdomain';
$installation_settings['{ADMINPHONE}'] = '(000) 001 02 03';
$installation_settings['{PLATFORM_AUTH_SOURCE}'] = PLATFORM_AUTH_SOURCE;
$installation_settings['{ADMINLANGUAGE}'] = 'spanish';
$installation_settings['{HASHFUNCTIONMODE}'] = 'md5';
$db_script = $chamilo_path_folder.'install/db_main.sql';
$res = load_main_database($installation_settings,$db_script);
$this->assertFalse($res);
}
*/
public function testSplitSqlFile() {
$ret='';
@ -67,19 +36,6 @@ class TestInstallUpgrade extends UnitTestCase{
$this->assertTrue($res===true);
}
public function testGetSqlFileContents() {
ob_start();
$file='txt';
$section='course';
$print_errors=true;
$res = get_sql_file_contents($file,$section,$print_errors);
ob_end_clean();
if(is_bool($res));
$this->assertTrue(is_bool($res));
$this->assertTrue($res===true || $res === false);
//var_dump($res);
}
public function testMyDirectoryToArray() {
$chamilo_path_folder= api_get_path(SYS_PATH);
$directory= $chamilo_path_folder.'home';

Write Preview
Loading…
Cancel
Save