Update of /cvsroot/squirrelmail/squirrelmail/include/options
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30870/include/options
Modified Files:
display.php
Log Message:
removing $available_languages option
Index: display.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/options/display.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -w -r1.48 -r1.49
--- display.php 23 Apr 2005 12:07:39 -0000 1.48
+++ display.php 6 Aug 2005 06:01:49 -0000 1.49
@@ -52,7 +52,7 @@
function load_optpage_data_display() {
global $theme, $language, $languages,
$default_use_mdn, $squirrelmail_language, $allow_thread_sort,
- $show_alternative_names, $available_languages, $use_icons, $use_iframe;
+ $show_alternative_names, $use_icons, $use_iframe;
/* Build a simple array into which we will build options. */
$optgrps = array();
@@ -106,12 +106,7 @@
}
- // config.php can be unupdated.
- if (! isset($available_languages) || $available_languages=="" ) {
- $available_languages="ALL"; }
-
$language_values = array();
- if ( strtoupper($available_languages)=='ALL') {
foreach ($languages as $lang_key => $lang_attributes) {
if (isset($lang_attributes['NAME'])) {
$language_values[$lang_key] = $lang_attributes['NAME'];
@@ -122,26 +117,13 @@
}
}
}
- } else if (strtoupper($available_languages)!='NONE') {
- // admin can set list of available languages in config
- $available_languages_array=explode (" ",$available_languages);
- foreach ($available_languages_array as $lang_key ) {
- if (isset($languages[$lang_key]['NAME'])) {
- $language_values[$lang_key] = $languages[$lang_key]['NAME'];
- if ( isset($show_alternative_names) &&
- $show_alternative_names &&
- isset($languages[$lang_key]['ALTNAME']) ) {
- $language_values[$lang_key] .= " / " .
$languages[$lang_key]['ALTNAME'];
- }
- }
- }
- }
+
asort($language_values);
$language_values =
array_merge(array('' => _("Default")), $language_values);
$language = $squirrelmail_language;
- if (strtoupper($available_languages)!='NONE') {
- // if set to 'none', interface will use only default language
+
+ // TODO: maybe we can add count($language_values) check here
$optvals[SMOPT_GRP_GENERAL][] = array(
'name' => 'language',
'caption' => _("Language"),
@@ -150,7 +132,6 @@
'posvals' => $language_values,
'htmlencoded' => true
);
- }
/* Set values for the "use javascript" option. */
$optvals[SMOPT_GRP_GENERAL][] = array(
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@xxxxxxxxxxxxxxxx
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
|
