common.rb#load_all_users: return a map of uid=>info, instead of an array of infos

1 files changed, 7 insertions, 1 deletions

diff --git a/bin/common.rb b/bin/common.rb
index a5840ec..4380340 100644
--- a/bin/common.rb
+++ b/bin/common.rb
@@ -12,5 +12,11 @@ def load_user_yaml(filename)
 end
 
 def load_all_users
-	Dir.glob("#{cfg["yamldir"]}/*.yml").map{|filename|load_user_yaml(filename)}
+	users = {}
+	Dir.glob("#{cfg["yamldir"]}/*.yml").map{|filename|
+		uid = File.basename(filename).sub(/^([0-9]*)\.yml$/, "\\1").to_i
+		user = load_user_yaml(filename)
+		users[uid] = user
+	}
+	return users
 end