Merge 0.8->trunk

2 files changed, 21 insertions, 0 deletions

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index f323e606..462670e6 100644
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -13,6 +13,8 @@ local motd_jid = module:get_option("motd_jid") or host;
 
 local st = require "util.stanza";
 
+motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config
+
 module:hook("resource-bind",
 	function (event)
 		local session = event.session;
diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua
new file mode 100644
index 00000000..821d1e1a
--- /dev/null
+++ b/plugins/mod_storage_internal.lua
@@ -0,0 +1,19 @@
+local datamanager = require "core.storagemanager".olddm;
+
+local host = module.host;
+
+local driver = { name = "internal" };
+local driver_mt = { __index = driver };
+
+function driver:open(store)
+	return setmetatable({ store = store }, driver_mt);
+end
+function driver:get(user)
+	return datamanager.load(user, host, self.store);
+end
+
+function driver:set(user, data)
+	return datamanager.store(user, host, self.store, data);
+end
+
+module:add_item("data-driver", driver);