- huge refactoring of admin/configuration.php (reminder : tabs in code are

  forbidden, only blank spaces are allowed)

- in admin panel, remote site management is in "general" section and not in
  "configuration" section

- when retrieving languages, the array keys must be the language code and
  not its display name (because 2 language codes might have the same display
  name)


git-svn-id: http://piwigo.org/svn/trunk@528 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 2 insertions, 2 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 1e4cc44c7..1bd3abd07 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -277,7 +277,7 @@ function get_languages()
     if (is_dir($path) and !is_link($path) and file_exists($path.'/iso.txt'))
     {
       list($language_name) = @file($path.'/iso.txt');
-      $languages[$language_name] = $file;
+      $languages[$file] = $language_name;
     }
   }
   closedir($dir);
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 4c68aa019..103bac3f0 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -116,7 +116,7 @@ function language_select($default, $select_name = "language")
   $available_lang = get_languages();
 
   $lang_select = '<select name="' . $select_name . '" onchange="this.form.submit()">';
-  foreach ($available_lang as $displayname => $code)
+  foreach ($available_lang as $code => $displayname)
   {
     $selected = ( strtolower($default) == strtolower($code) ) ? ' selected="selected"' : '';
     $lang_select .= '<option value="' . $code . '"' . $selected . '>' . ucwords($displayname) . '</option>';