diff options
Diffstat (limited to 'lisp/sql')
| -rw-r--r-- | lisp/sql/auth-pkg.lisp | 6 | ||||
| -rw-r--r-- | lisp/sql/user-session-pkg.lisp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lisp/sql/auth-pkg.lisp b/lisp/sql/auth-pkg.lisp index 21a996e..58d89cc 100644 --- a/lisp/sql/auth-pkg.lisp +++ b/lisp/sql/auth-pkg.lisp @@ -166,9 +166,9 @@ (let* ((auth-pkg (make-instance 'auth-pkg)) (has-all-roles-p (let ((has-all-roles-p t)) (with-bogenherr-database - (loop for role in (if (listp ,roles) ,roles (list ,roles)) do - (when (not (has-role auth-pkg ,session-name role)) - (setf has-all-roles-p nil))) + (loop for role in (if (listp ,roles) ,roles (list ,roles)) + do (when (not (has-role auth-pkg ,session-name role)) + (setf has-all-roles-p nil))) has-all-roles-p)))) (if has-all-roles-p ,@body diff --git a/lisp/sql/user-session-pkg.lisp b/lisp/sql/user-session-pkg.lisp index 0adba55..954f84f 100644 --- a/lisp/sql/user-session-pkg.lisp +++ b/lisp/sql/user-session-pkg.lisp @@ -106,11 +106,11 @@ variable." (setf org-ckons-session::*gc-last-cycle-timestamp* (get-universal-time)) (with-bogenherr-database (let ((user-session-pkg (make-instance 'user-session-pkg))) - (loop for user-session in (get-user-sessions user-session-pkg) do - (let ((inactive-time (- org-ckons-session::*gc-last-cycle-timestamp* (datetime user-session)))) - (when (and (> inactive-time org-ckons-session::*session-timeout*) - (sessionid user-session)) - (org-ckons-core::logger (format nil "Deleting expired session: id = [~a] ; sessionid = [~a]" (id user-session) (sessionid user-session))) - (loop for user-session-object in (get-user-session-objects user-session-pkg user-session) do - (delete-record user-session-pkg user-session-object)) - (delete-record user-session-pkg user-session)))))))) + (loop for user-session in (get-user-sessions user-session-pkg) + do (let ((inactive-time (- org-ckons-session::*gc-last-cycle-timestamp* (datetime user-session)))) + (when (and (> inactive-time org-ckons-session::*session-timeout*) + (sessionid user-session)) + (org-ckons-core::logger (format nil "Deleting expired session: id = [~a] ; sessionid = [~a]" (id user-session) (sessionid user-session))) + (loop for user-session-object in (get-user-session-objects user-session-pkg user-session) + do (delete-record user-session-pkg user-session-object)) + (delete-record user-session-pkg user-session)))))))) |