Commit b72972fd authored by Leigh B Stoller's avatar Leigh B Stoller

Oops, forgot to conditionalize on ZFS!

parent b9ec1a54
...@@ -1113,8 +1113,10 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null, ...@@ -1113,8 +1113,10 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null,
# every time the user logs in of course, and since exports_setup is # every time the user logs in of course, and since exports_setup is
# using one week as its threshold, we can just do it on a daily basis. # using one week as its threshold, we can just do it on a daily basis.
# #
if ($WITHZFS && $ZFS_NOEXPORT) {
$query_result = $query_result =
DBQueryFatal("select UNIX_TIMESTAMP(weblogin_last) from users as u ". DBQueryFatal("select UNIX_TIMESTAMP(weblogin_last) ".
" from users as u ".
"left join user_stats as s on s.uid_idx=u.uid_idx ". "left join user_stats as s on s.uid_idx=u.uid_idx ".
"where u.uid_idx='$uid_idx'"); "where u.uid_idx='$uid_idx'");
if (mysql_num_rows($query_result)) { if (mysql_num_rows($query_result)) {
...@@ -1122,7 +1124,9 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null, ...@@ -1122,7 +1124,9 @@ function DOLOGIN_MAGIC($uid, $uid_idx, $email = null,
$lastlogin = $lastrow[0]; $lastlogin = $lastrow[0];
if (time() - $lastlogin > (24 * 3600)) { if (time() - $lastlogin > (24 * 3600)) {
SUEXEC("nobody", "nobody", "webexports_setup", SUEXEC_ACTION_DIE); SUEXEC("nobody", "nobody", "webexports_setup",
SUEXEC_ACTION_DIE);
}
} }
} }
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment