Optimize language metadata parsing

Use single loop instead of two.
Also use “metadata.php” as the data file.

qa-include/qa-app-admin.php

@@ -123,21 +123,19 @@
 
 		$options = array('' => 'English (US)');
 
-		$directory = @opendir(QA_LANG_DIR);
-		if (is_resource($directory)) {
-			while (($code = readdir($directory)) !== false) {
-				if (is_dir(QA_LANG_DIR . $code) && isset($codetolanguage[$code]))
-					$options[$code] = $codetolanguage[$code];
-			}
-			closedir($directory);
-		}
-
-		foreach (glob(QA_LANG_DIR . '*/qa-lang-metadata.php') as $filename) {
-			$code = basename(dirname($filename));
-			$metadata = include QA_LANG_DIR . $code . '/qa-lang-metadata.php';
+		// find all language folders
+		foreach (glob(QA_LANG_DIR.'*', GLOB_NOSORT) as $directory) {
+			$code = basename($directory);
+			$metadatafile = QA_LANG_DIR . $code . '/metadata.php';
+			if (is_file($metadatafile)) {
+				$metadata = include $metadatafile;
 				if (isset($metadata['display_name']))
 					$options[$code] = $metadata['display_name'];
 			}
+			// otherwise use an entry from above
+			else if (isset($codetolanguage[$code]))
+				$options[$code] = $codetolanguage[$code];
+		}
 
 		asort($options, SORT_STRING);
 

qa-lang/en-GB/qa-lang-metadata.php → qa-lang/en-GB/metadata.php

 <?php
-
 /*
 	Question2Answer (c) Gideon Greenspan
 
@@ -24,11 +23,6 @@
 	More about this license: http://www.question2answer.org/license.php
 */
 
-	return array(
+return array(
 	'display_name' => 'English (UK)',
-	);
-
-
-/*
-	Omit PHP closing tag to help avoid accidental output
-*/
+);
\ No newline at end of file