Changeset 5357 for trunk/include/functions.inc.php

Timestamp:

Mar 25, 2010, 9:18:28 PM (14 years ago)

Author:

patdenice

Message:

Feature 1535: Add language manager.

File:

• trunk/include/functions.inc.php (modified) (1 diff)

trunk/include/functions.inc.php

@@ -397 +397 @@
  * @returns array
  */
-function get_languages($target_charset = null)
-{
-  if ( empty($target_charset) )
-  {
-    $target_charset = get_pwg_charset();
-  }
-  $target_charset = strtolower($target_charset);
-
-  $dir = opendir(PHPWG_ROOT_PATH.'language');
+function get_languages()
+{
+  $query = '
+SELECT id, name
+  FROM '.LANGUAGES_TABLE.'
+  ORDER BY name ASC
+;';
+  $result = pwg_query($query);
+
   $languages = array();
-
-  while ($file = readdir($dir))
-  {
-    $path = PHPWG_ROOT_PATH.'language/'.$file;
-    if (!is_link($path) and is_dir($path) and file_exists($path.'/iso.txt'))
-    {
-      list($language_name) = @file($path.'/iso.txt');
-
-      $languages[$file] = convert_charset($language_name, $target_charset);
-    }
-  }
-  closedir($dir);
-  @asort($languages);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    if (is_dir(PHPWG_ROOT_PATH.'language/'.$row['id']))
+    {
+      $languages[ $row['id'] ] = $row['name'];
+    }
+  }
 
   return $languages;