aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-15 05:34:30 +0100
committerKim Alvefur <zash@zash.se>2012-12-15 05:34:30 +0100
commit0197a4d854394ae820f72d561482936428e51272 (patch)
treefc2c8b6bbbc983b20cab69ef02c7da19bb9b7709 /util
parentafef23ee7e4fb91436f8a07c1cfa6cc876126abb (diff)
parent1d8297ca4f2e491fa3e3cf5f3416337f19d31e7c (diff)
downloadprosody-0197a4d854394ae820f72d561482936428e51272.tar.gz
prosody-0197a4d854394ae820f72d561482936428e51272.zip
Merge
Diffstat (limited to 'util')
-rw-r--r--util/datamanager.lua6
1 files changed, 1 insertions, 5 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 08d9d6af..b70ad931 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -113,12 +113,9 @@ function getpath(username, host, datastore, ext, create)
if username then
if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end
return format("%s/%s/%s/%s.%s", data_path, host, datastore, username, ext);
- elseif host then
+ else
if create then mkdir(mkdir(data_path).."/"..host); end
return format("%s/%s/%s.%s", data_path, host, datastore, ext);
- else
- if create then mkdir(data_path); end
- return format("%s/%s.%s", data_path, datastore, ext);
end
end
@@ -343,7 +340,6 @@ end
function purge(username, host)
local host_dir = format("%s/%s/", data_path, encode(host));
- local deleted = 0;
local errs = {};
for file in lfs.dir(host_dir) do
if lfs.attributes(host_dir..file, "mode") == "directory" then