From 9efd3b52a9546cf67e09345a3416a57a26ae6194 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 16 Oct 2012 15:56:28 +0200 Subject: [PATCH] Now you can't disable the current platform language + when disabling a language that is used by users, the system will ask if you want to set the default platform language to all users instead of the disabled language see #3877 --- main/admin/languages.php | 379 +++++++++++++++--------------- main/admin/sub_language.class.php | 306 ++++++++++++++---------- main/inc/lib/usermanager.lib.php | 31 ++- 3 files changed, 394 insertions(+), 322 deletions(-) diff --git a/main/admin/languages.php b/main/admin/languages.php index 6291a60f22..96cc4298fd 100644 --- a/main/admin/languages.php +++ b/main/admin/languages.php @@ -1,19 +1,20 @@ + + +$htmlHeadXtra[] = ''; // setting the table that is needed for the styles management (there is a check if it exists later in this code) -$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); -$tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); +$tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); +$tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); /* -============================================================================== - STORING THE CHANGES -============================================================================== -*/ + ============================================================================== + STORING THE CHANGES + ============================================================================== + */ // we change the availability if ($_GET['action'] == 'makeunavailable') { - - if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) { - SubLanguageManager::make_unavailable_language($_GET['id']); - } + if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) { + SubLanguageManager::make_unavailable_language($_GET['id']); + } } if ($_GET['action'] == 'makeavailable') { - - if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) { - SubLanguageManager::make_available_language($_GET['id']); - } + if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) { + SubLanguageManager::make_available_language($_GET['id']); + } } if ($_GET['action'] == 'setplatformlanguage') { - - if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) { - SubLanguageManager::set_platform_language($_GET['id']); - } - + if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) { + SubLanguageManager::set_platform_language($_GET['id']); + } } -if ($_POST['Submit']) -{ - // changing the name - $sql_update = "UPDATE $tbl_admin_languages SET original_name='{$_POST['txt_name']}' WHERE id='{$_POST['edit_id']}'"; - $result = Database::query($sql_update); - // changing the Platform language - if ($_POST['platformlanguage'] && $_POST['platformlanguage'] <> '') - { - //$sql_update_2 = "UPDATE $tbl_settings_current SET selected_value='{$_POST['platformlanguage']}' WHERE variable='platformLanguage'"; - //$result_2 = Database::query($sql_update_2); - api_set_setting('platformLanguage',$_POST['platformlanguage'],null,null,$_configuration['access_url']); - } -} -elseif (isset($_POST['action'])) -{ - switch ($_POST['action']) - { - case 'makeavailable' : - if (count($_POST['id']) > 0) - { - $ids = array (); - foreach ($_POST['id'] as $index => $id) - { - $ids[] = Database::escape_string($id); - } - $sql = "UPDATE $tbl_admin_languages SET available='1' WHERE id IN ('".implode("','", $ids)."')"; - Database::query($sql); - } - break; - case 'makeunavailable' : - if (count($_POST['id']) > 0) - { - $ids = array (); - foreach ($_POST['id'] as $index => $id) - { - $ids[] = Database::escape_string($id); - } - $sql = "UPDATE $tbl_admin_languages SET available='0' WHERE id IN ('".implode("','", $ids)."')"; - Database::query($sql); - } - break; - } +if ($_POST['Submit']) { + // changing the name + $sql_update = "UPDATE $tbl_admin_languages SET original_name='{$_POST['txt_name']}' WHERE id='{$_POST['edit_id']}'"; + $result = Database::query($sql_update); + // changing the Platform language + if ($_POST['platformlanguage'] && $_POST['platformlanguage'] <> '') { + //$sql_update_2 = "UPDATE $tbl_settings_current SET selected_value='{$_POST['platformlanguage']}' WHERE variable='platformLanguage'"; + //$result_2 = Database::query($sql_update_2); + api_set_setting('platformLanguage', $_POST['platformlanguage'], null, null, $_configuration['access_url']); + } +} elseif (isset($_POST['action'])) { + switch ($_POST['action']) { + case 'makeavailable' : + if (count($_POST['id']) > 0) { + $ids = array(); + foreach ($_POST['id'] as $index => $id) { + $ids[] = Database::escape_string($id); + } + $sql = "UPDATE $tbl_admin_languages SET available='1' WHERE id IN ('" . implode("','", $ids) . "')"; + Database::query($sql); + } + break; + case 'makeunavailable' : + if (count($_POST['id']) > 0) { + $ids = array(); + foreach ($_POST['id'] as $index => $id) { + $ids[] = Database::escape_string($id); + } + $sql = "UPDATE $tbl_admin_languages SET available='0' WHERE id IN ('" . implode("','", $ids) . "')"; + Database::query($sql); + } + break; + } } /* -============================================================================== - MAIN CODE -============================================================================== -*/ + ============================================================================== + MAIN CODE + ============================================================================== + */ // setting the name of the tool $tool_name = get_lang('PlatformLanguages'); // setting breadcrumbs -$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); // including the header file (which includes the banner itself) Display :: display_header($tool_name); - -// displaying the naam of the tool -//api_display_tool_title($tool_name); + +if (isset($_GET['action']) && $_GET['action'] == 'make_unavailable_confirmed') { + $language_info = SubLanguageManager::get_all_information_of_language($_GET['id']); + if ($language_info['available'] == 1) { + SubLanguageManager::make_unavailable_language($_GET['id']); + $platform_language = api_get_setting('platformLanguage'); + UserManager::update_all_user_languages($language_info['english_name'], $platform_language); + Display::display_confirmation_message(get_lang('LanguageIsNowHidden')); + } +} // displaying the explanation for this tool -echo '

'.get_lang('PlatformLanguagesExplanation').'

'; +Display::display_normal_message(get_lang('PlatformLanguagesExplanation')); // selecting all the languages $sql_select = "SELECT * FROM $tbl_admin_languages"; @@ -209,74 +217,79 @@ $result_select = Database::query($sql_select); $sql_select_lang = "SELECT * FROM $tbl_settings_current WHERE category='Languages'"; $result_select_lang = Database::query($sql_select_lang); -$row_lang=Database::fetch_array($result_select_lang); +$row_lang = Database::fetch_array($result_select_lang); /* --------------------------------------- - DISPLAY THE TABLE --------------------------------------- -*/ + -------------------------------------- + DISPLAY THE TABLE + -------------------------------------- + */ // the table data -$language_data = array (); +$language_data = array(); while ($row = Database::fetch_array($result_select)) { - $row_td = array (); - $row_td[] = $row['id']; - // the first column is the original name of the language OR a form containing the original name - if ($_GET['action'] == 'edit' and $row['id'] == $_GET['id']) { - if ($row['english_name'] == api_get_setting('platformLanguage')) { - $checked = ' checked="checked" '; - } - - $row_td[] = ' ' - . ' '; - } else { - $row_td[] = $row['original_name']; - } - // the second column - $row_td[] = $row['english_name']; - // the third column - $row_td[] = $row['dokeos_folder']; - - if ($row['english_name'] == $row_lang['selected_value']){ - $setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'),'',ICON_SIZE_SMALL); - } else { - $setplatformlanguage = "".Display::return_icon('languages_na.png',get_lang('SetLanguageAsDefault'),'',ICON_SIZE_SMALL).""; - } - if (api_get_setting('allow_use_sub_language')=='true') { - - $verified_if_is_sub_language=SubLanguageManager::check_if_language_is_sub_language($row['id']); - - if ($verified_if_is_sub_language===false) { - $verified_if_is_father=SubLanguageManager::check_if_language_is_father($row['id']); - $allow_use_sub_language = " ".Display::return_icon('new_language.png', get_lang('CreateSubLanguage'),array(),ICON_SIZE_SMALL).""; - if ($verified_if_is_father===true) { - //$allow_add_term_sub_language = " ".Display::return_icon('2rightarrow.gif', get_lang('AddWordForTheSubLanguage'),array('width'=>ICON_SIZE_SMALL,'height'=>ICON_SIZE_SMALL)).""; - $allow_add_term_sub_language=''; - } else { - $allow_add_term_sub_language=''; - } - } else { - $allow_use_sub_language=''; - $all_information_of_sub_language=SubLanguageManager::get_all_information_of_language($row['id']); - $allow_add_term_sub_language = " ".Display::return_icon('2rightarrow.gif', get_lang('AddWordForTheSubLanguage'),array('width'=>ICON_SIZE_SMALL,'height'=>ICON_SIZE_SMALL)).""; - $allow_delete_sub_language = " ".Display::return_icon('delete.png', get_lang('DeleteSubLanguage'),array('width'=>ICON_SIZE_SMALL,'height'=>ICON_SIZE_SMALL)).""; - } - - } else { - $allow_use_sub_language=''; - $allow_add_term_sub_language=''; - } - if ($row['available'] == 1) { - $row_td[] = "".Display::return_icon('visible.png', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']),ICON_SIZE_SMALL)." ".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language; - //$row_td[] = "".Display::return_icon('visible.gif', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']))." ".Display::return_icon('edit.gif', get_lang('Edit'))." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language; - } else { - $row_td[] = "".Display::return_icon('invisible.png', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']),ICON_SIZE_SMALL)." ".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language; - //$row_td[] = "".Display::return_icon('invisible.gif', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']))." ".Display::return_icon('edit.gif', get_lang('Edit'))." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language; - } - - $language_data[] = $row_td; + $row_td = array(); + $row_td[] = $row['id']; + // the first column is the original name of the language OR a form containing the original name + if ($_GET['action'] == 'edit' and $row['id'] == $_GET['id']) { + if ($row['english_name'] == api_get_setting('platformLanguage')) { + $checked = ' checked="checked" '; + } + + $row_td[] = ' ' + . ' '; + } else { + $row_td[] = $row['original_name']; + } + + // the second column + $row_td[] = $row['english_name']; + + // the third column + $row_td[] = $row['dokeos_folder']; + + if ($row['english_name'] == $row_lang['selected_value']) { + $setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'), '', ICON_SIZE_SMALL); + } else { + $setplatformlanguage = "" . Display::return_icon('languages_na.png', get_lang('SetLanguageAsDefault'), '', ICON_SIZE_SMALL) . ""; + } + + if (api_get_setting('allow_use_sub_language') == 'true') { + + $verified_if_is_sub_language = SubLanguageManager::check_if_language_is_sub_language($row['id']); + + if ($verified_if_is_sub_language === false) { + $verified_if_is_father = SubLanguageManager::check_if_language_is_father($row['id']); + $allow_use_sub_language = " " . Display::return_icon('new_language.png', get_lang('CreateSubLanguage'), array(), ICON_SIZE_SMALL) . ""; + if ($verified_if_is_father === true) { + //$allow_add_term_sub_language = " ".Display::return_icon('2rightarrow.gif', get_lang('AddWordForTheSubLanguage'),array('width'=>ICON_SIZE_SMALL,'height'=>ICON_SIZE_SMALL)).""; + $allow_add_term_sub_language = ''; + } else { + $allow_add_term_sub_language = ''; + } + } else { + $allow_use_sub_language = ''; + $all_information_of_sub_language = SubLanguageManager::get_all_information_of_language($row['id']); + $allow_add_term_sub_language = " " . Display::return_icon('2rightarrow.gif', get_lang('AddWordForTheSubLanguage'), array('width' => ICON_SIZE_SMALL, 'height' => ICON_SIZE_SMALL)) . ""; + $allow_delete_sub_language = " " . Display::return_icon('delete.png', get_lang('DeleteSubLanguage'), array('width' => ICON_SIZE_SMALL, 'height' => ICON_SIZE_SMALL)) . ""; + } + } else { + $allow_use_sub_language = ''; + $allow_add_term_sub_language = ''; + } + + if ($row['english_name'] == $row_lang['selected_value']) { + $row_td[] = Display::return_icon('visible.png', get_lang('Visible'))."" . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . " +  " . $setplatformlanguage . $allow_use_sub_language . $allow_add_term_sub_language . $allow_delete_sub_language; + } else { + if ($row['available'] == 1) { + $row_td[] = "" . Display::return_icon('visible.png', get_lang('MakeUnavailable'), array('id' => 'imglinktool_' . $row['id']), ICON_SIZE_SMALL) . " " . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . " " . $setplatformlanguage . $allow_use_sub_language . $allow_add_term_sub_language . $allow_delete_sub_language; + } else { + $row_td[] = "" . Display::return_icon('invisible.png', get_lang('MakeAvailable'), array('id' => 'imglinktool_' . $row['id']), ICON_SIZE_SMALL) . " " . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . " " . $setplatformlanguage . $allow_use_sub_language . $allow_add_term_sub_language . $allow_delete_sub_language; + } + } + $language_data[] = $row_td; } $table = new SortableTableFromArrayConfig($language_data, 1, count($language_data)); @@ -285,7 +298,7 @@ $table->set_header(1, get_lang('OriginalName')); $table->set_header(2, get_lang('EnglishName')); $table->set_header(3, get_lang('DokeosFolder')); $table->set_header(4, get_lang('Properties')); -$form_actions = array (); +$form_actions = array(); $form_actions['makeavailable'] = get_lang('MakeAvailable'); $form_actions['makeunavailable'] = get_lang('MakeUnavailable'); $table->set_form_actions($form_actions); @@ -293,9 +306,9 @@ echo '
 
'; $table->display(); /* -============================================================================== - FOOTER -============================================================================== -*/ + ============================================================================== + FOOTER + ============================================================================== + */ Display :: display_footer(); ?> diff --git a/main/admin/sub_language.class.php b/main/admin/sub_language.class.php index 9c93f1bb5e..a93265555c 100644 --- a/main/admin/sub_language.class.php +++ b/main/admin/sub_language.class.php @@ -1,15 +1,18 @@ -'.' && substr($file,-4,strlen($file))=='.php') { - if ($only_main_name) { - if ($file!='' && strpos($file, '.inc.php')) - $content_dir[]=substr($file, 0, strpos($file, '.inc.php')); - } else { - $content_dir[]=$file; - } - } - + if ($file[0] <> '.' && substr($file, -4, strlen($file)) == '.php') { + if ($only_main_name) { + if ($file != '' && strpos($file, '.inc.php')) + $content_dir[] = substr($file, 0, strpos($file, '.inc.php')); + } else { + $content_dir[] = $file; + } + } } - } - closedir($dh); + closedir($dh); return $content_dir; } } + /** * Get all information of sub-language * @param Integer The parent id(Language father id) * @param Integer The sub language id * @return Array All information about sub-language */ - public static function get_all_information_of_sub_language ($parent_id,$sub_language_id) { - $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql='SELECT * FROM '.$tbl_admin_languages.' WHERE parent_id="'.Database::escape_string($parent_id).'" AND id="'.Database::escape_string($sub_language_id).'"'; - $rs=Database::query($sql); - $all_information=array(); - while ($row=Database::fetch_array($rs,'ASSOC')) { - $all_information=$row; + public static function get_all_information_of_sub_language($parent_id, $sub_language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql = 'SELECT * FROM ' . $tbl_admin_languages . ' WHERE parent_id="' . Database::escape_string($parent_id) . '" AND id="' . Database::escape_string($sub_language_id) . '"'; + $rs = Database::query($sql); + $all_information = array(); + while ($row = Database::fetch_array($rs, 'ASSOC')) { + $all_information = $row; } return $all_information; } + /** * Get all information of language * @param Integer The parent id(Language father id) * @return Array All information about language */ - 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).'"'; - $rs=Database::query($sql); - $all_information=array(); - while ($row=Database::fetch_array($rs, 'ASSOC')) { - $all_information=$row; + 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) . '"'; + $rs = Database::query($sql); + $all_information = array(); + while ($row = Database::fetch_array($rs, 'ASSOC')) { + $all_information = $row; } return $all_information; - } - /** + } + + /** * Get all information of chamilo file * @param String The chamilo path file (/var/www/chamilo/main/lang/spanish/gradebook.inc.php) * @patam Bool Whether we want to remove the '$' prefix in the results or not * @return Array Contains all information of chamilo file */ - public static function get_all_language_variable_in_file($system_path_file, $get_as_string_index=false) { - $res_list = array(); - if (!is_readable($system_path_file)) { - return $res_list; - } - $info_file=file($system_path_file); - foreach ($info_file as $line) { - if (substr($line,0,1)!='$') { continue; } - list($var,$val) = split('=',$line,2); - $var = trim($var); $val = trim($val); + public static function get_all_language_variable_in_file($system_path_file, $get_as_string_index = false) { + $res_list = array(); + if (!is_readable($system_path_file)) { + return $res_list; + } + $info_file = file($system_path_file); + foreach ($info_file as $line) { + if (substr($line, 0, 1) != '$') { + continue; + } + list($var, $val) = split('=', $line, 2); + $var = trim($var); + $val = trim($val); if ($get_as_string_index) { //remove the prefix $ - $var = substr($var,1); + $var = substr($var, 1); } $res_list[$var] = $val; } return $res_list; - } + } - /** + /** * Add file in sub-language directory and add header(tag php) * @param String The chamilo path file (/var/www/chamilo/main/lang/spanish/gradebook.inc.php) * @return bool */ public static function add_file_in_language_directory($system_path_file) { - $return_value = false; - $return_value = @file_put_contents($system_path_file,'0) { + + if (count($content) > 0) { foreach ($content as $value_content) { - $path_file = $dir.'/'.$value_content; + $path_file = $dir . '/' . $value_content; unlink($path_file); } return @rmdir($dir); @@ -178,23 +202,24 @@ class SubLanguageManager { } } - /** + /** * check if language exist by id * @param Integer The language id * @return Boolean */ - public static function check_if_exist_language_by_id ($language_id) { - $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql='SELECT count(*) as count FROM '.$tbl_admin_languages.' WHERE id="'.intval($language_id).'"'; - $rs=Database::query($sql); - if (Database::num_rows($rs)>0) { - if (Database::result($rs,0,'count') ==1) { + public static function check_if_exist_language_by_id($language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql = 'SELECT count(*) as count FROM ' . $tbl_admin_languages . ' WHERE id="' . intval($language_id) . '"'; + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + if (Database::result($rs, 0, 'count') == 1) { return true; } else { return false; } } else { - return false;; + return false; + ; } } @@ -203,110 +228,133 @@ class SubLanguageManager { * @param Integer The language id * @return String The original name of language */ - public static function get_name_of_language_by_id ($language_id) { - $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql='SELECT original_name FROM '.$tbl_admin_languages.' WHERE id="'.Database::escape_string($language_id).'"'; - $rs=Database::query($sql); - if (Database::num_rows($rs)>0) { - return Database::result($rs,0,'original_name'); + public static function get_name_of_language_by_id($language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql = 'SELECT original_name FROM ' . $tbl_admin_languages . ' WHERE id="' . Database::escape_string($language_id) . '"'; + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + return Database::result($rs, 0, 'original_name'); } else { return ''; } - } + /** * Verified if language is sub-language * @param Integer The language id * @return Boolean */ - public static function check_if_language_is_sub_language ($language_id) { - $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql='SELECT count(*) AS count FROM '.$tbl_admin_languages.' WHERE id="'.Database::escape_string($language_id).'" AND NOT ISNULL(parent_id)'; - $rs=Database::query($sql); + public static function check_if_language_is_sub_language($language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql = 'SELECT count(*) AS count FROM ' . $tbl_admin_languages . ' WHERE id="' . Database::escape_string($language_id) . '" AND NOT ISNULL(parent_id)'; + $rs = Database::query($sql); - if (Database::num_rows($rs)>0 && Database::result($rs,'0','count')==1) { - return true; + if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') == 1) { + return true; } else { - return false; - } + return false; + } } + + public static function check_if_language_is_used($language_id) { + $language_info = self::get_all_information_of_language($language_id); + $user_table = Database :: get_main_table(TABLE_MAIN_USER); + $sql = 'SELECT count(*) AS count FROM ' . $user_table . ' WHERE language ="' . Database::escape_string($language_info['english_name']).'"'; + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') >= 1) { + return true; + } else { + return false; + } + } + /** * Verified if language is father of an sub-language * @param Integer The language id * @return Boolean */ - public static function check_if_language_is_father ($language_id) { - $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql='SELECT count(*) AS count FROM '.$tbl_admin_languages.' WHERE parent_id="'.Database::escape_string($language_id).'" AND NOT ISNULL(parent_id);'; - $rs=Database::query($sql); + public static function check_if_language_is_father($language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql = 'SELECT count(*) AS count FROM ' . $tbl_admin_languages . ' WHERE parent_id="' . Database::escape_string($language_id) . '" AND NOT ISNULL(parent_id);'; + $rs = Database::query($sql); - if (Database::num_rows($rs)>0 && Database::result($rs,'0','count')==1) { + if (Database::num_rows($rs) > 0 && Database::result($rs, '0', 'count') == 1) { return true; } else { return false; } } + /** * Make unavailable the language * @param Integer The language id * @return void() */ - public static function make_unavailable_language ($language_id) { - $tbl_admin_languages= Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql_make_unavailable = "UPDATE $tbl_admin_languages SET available='0' WHERE id='".Database::escape_string($language_id)."'"; + public static function make_unavailable_language($language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql_make_unavailable = "UPDATE $tbl_admin_languages SET available='0' WHERE id='" . Database::escape_string($language_id) . "'"; $result = Database::query($sql_make_unavailable); return $result !== false; //only return false on sql error } + /** * Make available the language * @param Integer The language id * @return void */ - public static function make_available_language ($language_id) { - $tbl_admin_languages= Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql_make_available = "UPDATE $tbl_admin_languages SET available='1' WHERE id='".Database::escape_string($language_id)."'"; + public static function make_available_language($language_id) { + $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); + $sql_make_available = "UPDATE $tbl_admin_languages SET available='1' WHERE id='" . Database::escape_string($language_id) . "'"; $result = Database::query($sql_make_available); return $result !== false; //only return false on sql error } + /** * Set platform language * @param Integer The language id * @return void() */ - public static function set_platform_language ($language_id) { - if (empty($language_id) or (intval($language_id)!=$language_id)) { return false; } + public static function set_platform_language($language_id) { + if (empty($language_id) or (intval($language_id) != $language_id)) { + return false; + } $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); - $sql_update = "SELECT english_name FROM ". $tbl_admin_languages." WHERE id='".Database::escape_string($language_id)."'"; + $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); + $sql_update = "SELECT english_name FROM " . $tbl_admin_languages . " WHERE id='" . Database::escape_string($language_id) . "'"; $result = Database::query($sql_update); - $lang=Database::fetch_array($result); - $sql_update_2 = "UPDATE ".$tbl_settings_current." SET selected_value='".$lang['english_name']."' WHERE variable='platformLanguage'"; + $lang = Database::fetch_array($result); + $sql_update_2 = "UPDATE " . $tbl_settings_current . " SET selected_value='" . $lang['english_name'] . "' WHERE variable='platformLanguage'"; $result_2 = Database::query($sql_update_2); event_system(LOG_PLATFORM_LANGUAGE_CHANGE, LOG_PLATFORM_LANGUAGE, $lang['english_name']); return $result_2 !== false; } + /** * Get platform language ID * @return int The platform language ID */ - public static function get_platform_language_id () { + public static function get_platform_language_id() { $name = api_get_setting('platformLanguage'); $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $sql = "SELECT id FROM ". $tbl_admin_languages." WHERE english_name ='$name'"; + $sql = "SELECT id FROM " . $tbl_admin_languages . " WHERE english_name ='$name'"; $res = Database::query($sql); - if (Database::num_rows($res)<1) { return false;} + if (Database::num_rows($res) < 1) { + return false; + } $row = Database::fetch_array($res); return $row['id']; } + /* * Get parent language path (or null if no parent) * @param string Children language path * @return string Parent language path or null */ - public static function get_parent_language_path ($language_path) { + + public static function get_parent_language_path($language_path) { $tbl_admin_languages = Database :: get_main_table(TABLE_MAIN_LANGUAGE); - $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); - $sql_update = "SELECT dokeos_folder FROM ". $tbl_admin_languages." WHERE id=(SELECT parent_id FROM ". $tbl_admin_languages." WHERE dokeos_folder = '".Database::escape_string($language_path)."')"; + $tbl_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT); + $sql_update = "SELECT dokeos_folder FROM " . $tbl_admin_languages . " WHERE id=(SELECT parent_id FROM " . $tbl_admin_languages . " WHERE dokeos_folder = '" . Database::escape_string($language_path) . "')"; $result = Database::query($sql_update); if (Database::num_rows($result) == 0) { return null; @@ -314,5 +362,5 @@ class SubLanguageManager { $row = Database::fetch_array($result); return $row['dokeos_folder']; } -} -?> + +} \ No newline at end of file diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 2e464fe5c3..9a0c40dc5d 100644 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -3036,17 +3036,17 @@ class UserManager { // variable initialisation $course_list_sql = ''; $course_list = array(); - if(!empty($code_special_courses)){ + if(!empty($code_special_courses)) { $course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, course.tutor_name t, course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat - FROM ".$tbl_course_user." course_rel_user - LEFT JOIN ".$tbl_course." course - ON course.code = course_rel_user.course_code - LEFT JOIN ".$tbl_user_course_category." user_course_category - ON course_rel_user.user_course_cat = user_course_category.id - $join_access_url - WHERE $code_special_courses $where_access_url - GROUP BY course.code - ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC"; + FROM ".$tbl_course_user." course_rel_user + LEFT JOIN ".$tbl_course." course + ON course.code = course_rel_user.course_code + LEFT JOIN ".$tbl_user_course_category." user_course_category + ON course_rel_user.user_course_cat = user_course_category.id + $join_access_url + WHERE $code_special_courses $where_access_url + GROUP BY course.code + ORDER BY user_course_category.sort,course.title,course_rel_user.sort ASC"; $course_list_sql_result = Database::query($course_list_sql); while ($result_row = Database::fetch_array($course_list_sql_result)) { $course_list[] = $result_row; @@ -3707,4 +3707,15 @@ EOF; Database::query($sql); } } + + static function update_all_user_languages($from, $to) { + $table_user = Database::get_main_table(TABLE_MAIN_USER); + $from = Database::escape_string($from); + $to = Database::escape_string($to); + + if (!empty($to) && !empty($from)) { + $sql = "UPDATE $table_user SET language = '$to' WHERE language = '$from'"; + Database::query($sql); + } + } }