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

Merge

Browse Source
skala
Julio Montoya 16 years ago
parent d90a1a8111 f4221e5da9
commit 3e78b58d8a
10 changed files with 295 additions and 449 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. 638
      main/admin/configure_homepage.php
  2. 38
      main/inc/lib/internationalization.lib.php
  3. 2
      main/inc/lib/internationalization_database/conversion/character_map_selector.php
  4. 1
      main/inc/lib/internationalization_database/language_detection/update_language_profiles.php
  5. 3
      main/inc/lib/internationalization_database/name_order_conventions.php
  6. 4
      main/inc/lib/internationalization_database/non_utf8_encodings.php
  7. 34
      main/inc/lib/internationalization_internal.lib.php
  8. 2
      tests/main/gradebook/lib/be/category.class.test.php
  9. 2
      tests/test_manager.inc.php
  10. 12
      tests/test_suite.php

638
main/admin/configure_homepage.php
View File

File diff suppressed because it is too large Load Diff

38
main/inc/lib/internationalization.lib.php
Unescape View File

@ -1,4 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */
/** /**
* File: internationalization.lib.php * File: internationalization.lib.php
* Internationalization library for Chamilo 1.8.7 LMS * Internationalization library for Chamilo 1.8.7 LMS
@ -44,9 +46,7 @@ define ('LANGUAGE_DETECT_MAX_DELTA', 140000);
/** /**
* ----------------------------------------------------------------------------
* Initialization * Initialization
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -81,9 +81,7 @@ function api_set_internationalization_default_encoding($encoding) {
/** /**
* ----------------------------------------------------------------------------
* Language support * Language support
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -358,14 +356,12 @@ function api_is_latin1_compatible($language) {
/** /**
* ----------------------------------------------------------------------------
* Language recognition * Language recognition
* Based on the publication: * Based on the publication:
* W. B. Cavnar and J. M. Trenkle. N-gram-based text categorization. * W. B. Cavnar and J. M. Trenkle. N-gram-based text categorization.
* Proceedings of SDAIR-94, 3rd Annual Symposium on Document Analysis * Proceedings of SDAIR-94, 3rd Annual Symposium on Document Analysis
* and Information Retrieval, 1994. * and Information Retrieval, 1994.
* @link http://citeseer.ist.psu.edu/cache/papers/cs/810/http:zSzzSzwww.info.unicaen.frzSz~giguetzSzclassifzSzcavnar_trenkle_ngram.pdf/n-gram-based-text.pdf * @link http://citeseer.ist.psu.edu/cache/papers/cs/810/http:zSzzSzwww.info.unicaen.frzSz~giguetzSzclassifzSzcavnar_trenkle_ngram.pdf/n-gram-based-text.pdf
* ----------------------------------------------------------------------------
*/ */
function api_detect_language(&$string, $encoding = null) { function api_detect_language(&$string, $encoding = null) {
@ -385,9 +381,7 @@ function api_detect_language(&$string, $encoding = null) {
/** /**
* ----------------------------------------------------------------------------
* Date and time formats * Date and time formats
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -485,9 +479,7 @@ function api_get_months_long($language = null) {
/** /**
* ----------------------------------------------------------------------------
* Name order conventions * Name order conventions
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -594,9 +586,7 @@ function api_sort_by_first_name($language = null) {
/** /**
* ----------------------------------------------------------------------------
* A safe way to calculate binary lenght of a string (as number of bytes) * A safe way to calculate binary lenght of a string (as number of bytes)
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -620,9 +610,7 @@ function api_byte_count(& $string) {
/** /**
* ----------------------------------------------------------------------------
* Multibyte string conversion functions * Multibyte string conversion functions
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -1089,9 +1077,7 @@ function api_utf8_decode_xml($string, $to_encoding = null) {
/** /**
* ----------------------------------------------------------------------------
* Common multibyte string functions * Common multibyte string functions
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -2093,9 +2079,7 @@ function api_ucwords($string, $encoding = null) {
/** /**
* ----------------------------------------------------------------------------
* String operations using regular expressions * String operations using regular expressions
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -2219,9 +2203,7 @@ function api_preg_split($pattern, $subject, $limit = -1, $flags = 0, $encoding =
/** /**
* ----------------------------------------------------------------------------
* Obsolete string operations using regular expressions, to be deprecated * Obsolete string operations using regular expressions, to be deprecated
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -2428,9 +2410,7 @@ function api_split($pattern, $string, $limit = null) {
/** /**
* ----------------------------------------------------------------------------
* String comparison * String comparison
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -2507,9 +2487,7 @@ function api_strnatcmp($string1, $string2, $language = null, $encoding = null) {
/** /**
* ----------------------------------------------------------------------------
* Sorting arrays * Sorting arrays
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -2910,9 +2888,7 @@ function api_rsort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encodi
/** /**
* ----------------------------------------------------------------------------
* Common sting operations with arrays * Common sting operations with arrays
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -2951,9 +2927,7 @@ function api_in_array_nocase($needle, $haystack, $strict = false, $encoding = nu
/** /**
* ----------------------------------------------------------------------------
* Encoding management functions * Encoding management functions
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -3220,9 +3194,7 @@ function api_detect_encoding_xml($string, $default_encoding = null) {
/** /**
* ----------------------------------------------------------------------------
* String validation functions concerning certain encodings * String validation functions concerning certain encodings
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -3408,9 +3380,7 @@ function api_is_valid_ascii(&$string) {
/** /**
* ----------------------------------------------------------------------------
* Parsing CSV-data. * Parsing CSV-data.
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -3498,9 +3468,7 @@ function api_fgetcsv($handle, $length = null, $delimiter = ',', $enclosure = '"'
/** /**
* ----------------------------------------------------------------------------
* Miscellaneous routines * Miscellaneous routines
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -3528,9 +3496,7 @@ function api_html_to_text($string) {
/** /**
* ----------------------------------------------------------------------------
* Functions for internal use behind this API * Functions for internal use behind this API
* ----------------------------------------------------------------------------
*/ */
require_once dirname(__FILE__).'/internationalization_internal.lib.php'; require_once dirname(__FILE__).'/internationalization_internal.lib.php';

2
main/inc/lib/internationalization_database/conversion/character_map_selector.php
Unescape View File

@ -1,4 +1,6 @@
<?php <?php
/* For licensing terms, see /license.txt */
// See http://demo.icu-project.org/icu-bin/convexp // See http://demo.icu-project.org/icu-bin/convexp
return array( return array(

1
main/inc/lib/internationalization_database/language_detection/update_language_profiles.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
$_current_dir = str_replace('\\', '/', realpath(dirname(__FILE__))).'/'; $_current_dir = str_replace('\\', '/', realpath(dirname(__FILE__))).'/';

3
main/inc/lib/internationalization_database/name_order_conventions.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */
/** /**
* The following table contains two types of conventions concerning person names: * The following table contains two types of conventions concerning person names:
@ -14,8 +15,6 @@
* "sort_by" - determines you preferable way of sorting person names. The possible values are: * "sort_by" - determines you preferable way of sorting person names. The possible values are:
* first_name - sorting names with priority for the first name; * first_name - sorting names with priority for the first name;
* last_name - sorting names with priority for the last name. * last_name - sorting names with priority for the last name.
*
* For licensing terms, see dokeos_license.txt.
*/ */
return array( return array(
'afrikaans' => array( 'format' => 'title first_name last_name', 'sort_by' => 'first_name' ), 'afrikaans' => array( 'format' => 'title first_name last_name', 'sort_by' => 'first_name' ),

4
main/inc/lib/internationalization_database/non_utf8_encodings.php
Unescape View File

@ -1,10 +1,10 @@
<?php <?php
/* For licensing terms, see /license.txt */
/** /**
* Historical data about non UTF-8 encodings that might be used in Dokeos LMS. * Historical data about non UTF-8 encodings that might be used in Chamilo LMS.
* The following list may have some inconsistencies. * The following list may have some inconsistencies.
* Put the probably most used for your language encoding at the first place. * Put the probably most used for your language encoding at the first place.
* For licensing terms, see dokeos_license.txt.
*/ */
return array( return array(
'afrikaans' => array('ISO-8859-15', 'WINDOWS-1252'), 'afrikaans' => array('ISO-8859-15', 'WINDOWS-1252'),

34
main/inc/lib/internationalization_internal.lib.php
Unescape View File

@ -1,6 +1,7 @@
<?php <?php
/* For licensing terms, see /license.txt */
/** /**
* ==============================================================================
* File: internationalization_internal.lib.php * File: internationalization_internal.lib.php
* Main API extension library for Chamilo 1.8.7 LMS, * Main API extension library for Chamilo 1.8.7 LMS,
* contains functions for internal use only. * contains functions for internal use only.
@ -8,7 +9,6 @@
* @author Ivan Tcholakov, <ivantcholakov@gmail.com>, 2009, 2010 * @author Ivan Tcholakov, <ivantcholakov@gmail.com>, 2009, 2010
* @author More authors, mentioned in the correpsonding fragments of this source. * @author More authors, mentioned in the correpsonding fragments of this source.
* @package chamilo.library * @package chamilo.library
* ==============================================================================
* *
* Note: All functions and data structures here are not to be used directly. * Note: All functions and data structures here are not to be used directly.
* See the file internationalization.lib.php which contains the "public" API. * See the file internationalization.lib.php which contains the "public" API.
@ -16,9 +16,7 @@
/** /**
* ----------------------------------------------------------------------------
* Internal constants * Internal constants
* ----------------------------------------------------------------------------
*/ */
// A regular expression for accessing declared encoding within xml-formatted text. // A regular expression for accessing declared encoding within xml-formatted text.
@ -28,9 +26,7 @@ define('_PCRE_XML_ENCODING', '/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m');
/** /**
* ----------------------------------------------------------------------------
* Global variables used by some callback functions * Global variables used by some callback functions
* ----------------------------------------------------------------------------
*/ */
$_api_encoding = null; $_api_encoding = null;
@ -38,9 +34,7 @@ $_api_collator = null;
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Language support" * Appendix to "Language support"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -90,14 +84,12 @@ function _api_get_latin1_compatible_languages() {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Language recognition" * Appendix to "Language recognition"
* Based on the publication: * Based on the publication:
* W. B. Cavnar and J. M. Trenkle. N-gram-based text categorization. * W. B. Cavnar and J. M. Trenkle. N-gram-based text categorization.
* Proceedings of SDAIR-94, 3rd Annual Symposium on Document Analysis * Proceedings of SDAIR-94, 3rd Annual Symposium on Document Analysis
* and Information Retrieval, 1994. * and Information Retrieval, 1994.
* @link http://citeseer.ist.psu.edu/cache/papers/cs/810/http:zSzzSzwww.info.unicaen.frzSz~giguetzSzclassifzSzcavnar_trenkle_ngram.pdf/n-gram-based-text.pdf * @link http://citeseer.ist.psu.edu/cache/papers/cs/810/http:zSzzSzwww.info.unicaen.frzSz~giguetzSzclassifzSzcavnar_trenkle_ngram.pdf/n-gram-based-text.pdf
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -222,9 +214,7 @@ function & _api_compare_n_grams(&$n_grams, $encoding, $max_delta = LANGUAGE_DETE
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Date and time formats" * Appendix to "Date and time formats"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -254,9 +244,7 @@ function &_api_get_day_month_names($language = null) {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Name order conventions" * Appendix to "Name order conventions"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -318,9 +306,7 @@ function _api_clean_person_name($person_name) {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Multibyte string conversion functions" * Appendix to "Multibyte string conversion functions"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -468,7 +454,7 @@ function &_api_parse_character_map($name) {
* @author Henri Sivonen, mailto:hsivonen@iki.fi * @author Henri Sivonen, mailto:hsivonen@iki.fi
* @link http://hsivonen.iki.fi/php-utf8/ * @link http://hsivonen.iki.fi/php-utf8/
* @author Ivan Tcholakov, August 2009, adaptation for the Dokeos LMS. * @author Ivan Tcholakov, August 2009, adaptation for the Dokeos LMS.
*/ */
function _api_utf8_to_unicode(&$string) { function _api_utf8_to_unicode(&$string) {
$str = (string)$string; $str = (string)$string;
$state = 0; // cached expected number of octets after the current octet $state = 0; // cached expected number of octets after the current octet
@ -580,7 +566,7 @@ function _api_utf8_to_unicode(&$string) {
* Takes an array of Unicode codepoints and returns a UTF-8 string. * Takes an array of Unicode codepoints and returns a UTF-8 string.
* @param array $codepoints An array of Unicode codepoints representing a string. * @param array $codepoints An array of Unicode codepoints representing a string.
* @return string Returns a UTF-8 string constructed using the given codepoints. * @return string Returns a UTF-8 string constructed using the given codepoints.
*/ */
function _api_utf8_from_unicode($codepoints) { function _api_utf8_from_unicode($codepoints) {
return implode(array_map('_api_utf8_chr', $codepoints)); return implode(array_map('_api_utf8_chr', $codepoints));
} }
@ -682,9 +668,7 @@ function _api_convert_encoding_xml_callback($matches) {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Common multibyte string functions" * Appendix to "Common multibyte string functions"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -770,9 +754,7 @@ function _api_utf8_ucwords_callback($matches) {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Common sting operations with arrays" * Appendix to "Common sting operations with arrays"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -793,9 +775,7 @@ function _api_array_utf8_decode($variable) {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "String comparison" * Appendix to "String comparison"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -925,9 +905,7 @@ function _api_get_collator_sort_flag($sort_flag = SORT_REGULAR) {
/** /**
* ----------------------------------------------------------------------------
* ICU locales (accessible through intl extension). * ICU locales (accessible through intl extension).
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -979,9 +957,7 @@ function api_get_default_locale() {
/** /**
* ----------------------------------------------------------------------------
* Appendix to "Encoding management functions" * Appendix to "Encoding management functions"
* ----------------------------------------------------------------------------
*/ */
/** /**
@ -1229,9 +1205,7 @@ function _api_html_entity_supports($encoding) {
/** /**
* ----------------------------------------------------------------------------
* Upgrading the PHP5 mbstring extension * Upgrading the PHP5 mbstring extension
* ----------------------------------------------------------------------------
*/ */
// A multibyte replacement of strchr(). This function exists in PHP 5 >= 5.2.0 // A multibyte replacement of strchr(). This function exists in PHP 5 >= 5.2.0

2
tests/main/gradebook/lib/be/category.class.test.php
Unescape View File

@ -16,7 +16,7 @@ class TestCategoryClass extends UnitTestCase {
$this->category->set_user_id(1); $this->category->set_user_id(1);
$this->category->set_course_code('COURSECATEGORYCLASS'); $this->category->set_course_code('COURSECATEGORYCLASS');
$this->category->set_certificate_min_score(20); $this->category->set_certificate_min_score(20);
$this->category->set_parent_id(1); $this->category->set_parent_id(0);
$this->category->set_session_id(1); $this->category->set_session_id(1);
$this->category->set_weight(1); $this->category->set_weight(1);
$this->category->set_visible(1); $this->category->set_visible(1);

2
tests/test_manager.inc.php
Unescape View File

@ -255,7 +255,7 @@ if ($handle = opendir($path)) {
----------------------------------------------------------- -----------------------------------------------------------
*/ */
if (!headers_sent()) { if (!headers_sent() && session_id() != "") {
$res=api_session_destroy(); $res=api_session_destroy();
} }
} }

12
tests/test_suite.php
Unescape View File

@ -172,12 +172,12 @@ class TestsSuite extends TestSuite {
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/forum/forumfunction.inc.test.php'); //$this->addFile(api_get_path(SYS_TEST_PATH).'main/forum/forumfunction.inc.test.php');
/**GRADEBOOK*/ /**GRADEBOOK*/
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/attendancelink.class.test.php'); $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/attendancelink.class.test.php');
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/category.class.test.php'); $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/category.class.test.php');
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/dropboxlink.class.test.php'); $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/dropboxlink.class.test.php');
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/evaluation.class.test.php'); $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/evaluation.class.test.php');
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/exerciselink.class.test.php'); $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/exerciselink.class.test.php');
//$this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/forumthreadlink.class.test.php'); $this->addFile(api_get_path(SYS_TEST_PATH).'main/gradebook/lib/be/forumthreadlink.class.test.php');
/**NEW SCORM*/ /**NEW SCORM*/
//$this->addTestFile(dirname(__FILE__).'/main/newscorm/openoffice_presentation.class.test.php'); //$this->addTestFile(dirname(__FILE__).'/main/newscorm/openoffice_presentation.class.test.php');

Write Preview
Loading…
Cancel
Save