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

Minor corrections

Browse Source
skala
Julio Montoya 14 years ago
parent 222e895fff
commit 6803901e16
3 changed files with 29 additions and 31 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. 4
      main/admin/sub_language.class.php
  2. 36
      main/admin/sub_language.php
  3. 20
      main/inc/global.inc.php

4
main/admin/sub_language.class.php
Unescape View File

@ -61,10 +61,10 @@ class SubLanguageManager {
*/
public static function get_all_information_of_language ($parent_id) {
$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE);
$sql='SELECT * FROM '.$tbl_admin_languages.' WHERE id="'.intval($parent_id).'"';
$sql='SELECT * FROM '.$tbl_admin_languages.' WHERE id = "'.intval($parent_id).'"';
$rs=Database::query($sql);
$all_information=array();
while ($row=Database::fetch_array($rs,'ASSOC')) {
while ($row=Database::fetch_array($rs, 'ASSOC')) {
$all_information=$row;
}
return $all_information;

36
main/admin/sub_language.php
Unescape View File

@ -5,10 +5,8 @@
$language_file = 'admin';
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
require_once 'sub_language.class.php';
require_once api_get_path(LIBRARY_PATH).'array.lib.php';
$this_section=SECTION_PLATFORM_ADMIN;
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
$htmlHeadXtra[] ='<script type="text/javascript">
@ -58,31 +56,29 @@ $interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('Platfo
$sublanguage_folder_error = false;
if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
$language_name=SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
$sub_language_name=SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
$all_data_of_language=SubLanguageManager::get_all_information_of_language($_GET['id']);
$all_data_of_sublanguage=SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
$sub_language_file =api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
$language_name = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
$sub_language_name = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
$all_data_of_language = SubLanguageManager::get_all_information_of_language($_GET['id']);
$all_data_of_sublanguage = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
$sub_language_file = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
}
$my_language=$language_name;
if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
$parent_id=intval($_GET['id']);
$language_id_exist=true;
}
if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
$language_id_exist = true;
} else {
$language_id_exist=false;
$language_id_exist = false;
}
} else {
$language_name='';
$language_id_exist=false;
}
$language_name=get_lang('RegisterTermsOfSubLanguageForLanguage').' ( '.strtolower($sub_language_name).' )';
$dokeos_path_folder=api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
//
if (!is_dir($dokeos_path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
$language_name = get_lang('RegisterTermsOfSubLanguageForLanguage').' ( '.strtolower($sub_language_name).' )';
$path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
api_not_allowed(true);
}
@ -106,7 +102,6 @@ $html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
$html.='<input name="id" type="hidden" id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
$html.='<input name="sub_language_id" type="hidden" id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
$html.='<input name="txt_search_word" type="text" size="50" id="txt_search_word" value="'.Security::remove_XSS($_REQUEST['txt_search_word']).'" />';
$html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
$html.='</form>';
@ -118,9 +113,6 @@ if (!empty($sublanguage_folder_error)) {
}
echo '<div id="div_message_information_id">&nbsp;</div>';
/**
* Search a term in the language
* @param string the term to search

20
main/inc/global.inc.php
Unescape View File

@ -390,15 +390,20 @@ if (api_get_self() == api_get_path(REL_PATH).'main/admin/sub_language.php' || ap
// getting the arrays of files i.e notification, trad4all, etc
$language_files_to_load = SubLanguageManager:: get_lang_folder_files_list(api_get_path(SYS_LANG_PATH).'english', true);
//getting parent info
$parent_language = SubLanguageManager::get_all_information_of_language(intval($_REQUEST['id']));
$parent_language = SubLanguageManager::get_all_information_of_language($_REQUEST['id']);
//getting sub language info
$sub_language = SubLanguageManager::get_all_information_of_language(intval($_REQUEST['sub_language_id']));
$sub_language = SubLanguageManager::get_all_information_of_language($_REQUEST['sub_language_id']);
$english_language_array = $parent_language_array = $sub_language_array = array();
foreach ($language_files_to_load as $language_file_item) {
$lang_list_pre = array_keys($GLOBALS);
include $langpath.'english/'.$language_file_item.'.inc.php'; //loading english
//loading english
$path = $langpath.'english/'.$language_file_item.'.inc.php';
if (file_exists($path)) {
include $path;
}
$lang_list_post = array_keys($GLOBALS);
$lang_list_result = array_diff($lang_list_post, $lang_list_pre);
unset($lang_list_pre);
@ -407,14 +412,14 @@ if (api_get_self() == api_get_path(REL_PATH).'main/admin/sub_language.php' || ap
$english_language_array[$language_file_item] = compact($lang_list_result);
//cleaning the variables
foreach($lang_list_result as $item) {
foreach ($lang_list_result as $item) {
unset(${$item});
}
$parent_file = $langpath.$parent_language['dokeos_folder'].'/'.$language_file_item.'.inc.php';
if (is_file($parent_file)) {
if (file_exists($parent_file) && is_file($parent_file)) {
include_once $parent_file;
}
// parent language array
$parent_language_array[$language_file_item] = compact($lang_list_result);
@ -422,8 +427,9 @@ if (api_get_self() == api_get_path(REL_PATH).'main/admin/sub_language.php' || ap
foreach($lang_list_result as $item) {
unset(${$item});
}
$sub_file = $langpath.$sub_language['dokeos_folder'].'/'.$language_file_item.'.inc.php';
if (is_file($sub_file)) {
if (file_exists($sub_file) && is_file($sub_file)) {
include $sub_file;
}

Write Preview
Loading…
Cancel
Save