loop..do cleanup

6 files changed, 24 insertions, 24 deletions

diff --git a/lisp/service/base-service.lisp b/lisp/service/base-service.lisp
index 77df817..ecd9469 100644
--- a/lisp/service/base-service.lisp
+++ b/lisp/service/base-service.lisp
@@ -8,9 +8,9 @@
   (:documentation ""))
 
 (defmacro loop-intersect-slots ((slot record other-object) &body body)
-  `(loop for ,slot in (intersect-slots ,record (org-ckons-core::map-slot-names ,other-object)) do
-        (when (slot-is-field-p ,slot)
-          ,@body)))
+  `(loop for ,slot in (intersect-slots ,record (org-ckons-core::map-slot-names ,other-object))
+         do (when (slot-is-field-p ,slot)
+              ,@body)))
 
 (defmethod copy-from-record ((base-service base-service) (record record))
   (loop-intersect-slots (slot record base-service)
diff --git a/lisp/service/messages-service.lisp b/lisp/service/messages-service.lisp
index 18999ab..e03c04c 100644
--- a/lisp/service/messages-service.lisp
+++ b/lisp/service/messages-service.lisp
@@ -38,8 +38,8 @@
                                                        (id (get-user))
                                                        (string= (session-value :messages-read) "read")))))
     (sanitize-rest-json instance)
-    (loop for result in (results instance) do
-         (sanitize-json result))))
+    (loop for result in (results instance)
+          do (sanitize-json result))))
 
 (defclass messages/mark-service (messages-service)
   ((location-p :initform nil))
diff --git a/lisp/service/password-service.lisp b/lisp/service/password-service.lisp
index fee720e..32507d2 100644
--- a/lisp/service/password-service.lisp
+++ b/lisp/service/password-service.lisp
@@ -42,8 +42,8 @@
             (let ((auth-pkg (make-instance 'auth-pkg)))
               (loop for param in (remove-if (lambda (x)
                                               (intersection `(,x) '(id pwd2)))
-                                            (sb-introspect:function-lambda-list #'password-submit-json)) do
-                   (setf (slot-value user param) (symbol-value param)))
+                                            (sb-introspect:function-lambda-list #'password-submit-json))
+                    do (setf (slot-value user param) (symbol-value param)))
               (update-password auth-pkg user)
               (set-user user)
               (setf (session-value :message) "Password saved successfully."))
diff --git a/lisp/service/profile-service.lisp b/lisp/service/profile-service.lisp
index c5783ad..256d599 100644
--- a/lisp/service/profile-service.lisp
+++ b/lisp/service/profile-service.lisp
@@ -48,12 +48,12 @@
   (with-auth (instance profile/modify-service "profile-modify")
     (with-bogenherr-database
       (let ((user (get-user)))
-        (if (= id (id user))
+        (if (= (id user) id)
             (let ((auth-pkg (make-instance 'auth-pkg)))
               (loop for param in (remove-if (lambda (x)
                                               (intersection `(,x) '(id)))
-                                            (sb-introspect:function-lambda-list #'profile-modify-submit-json)) do
-                   (setf (slot-value user param) (symbol-value param)))
+                                            (sb-introspect:function-lambda-list #'profile-modify-submit-json))
+                    do (setf (slot-value user param) (symbol-value param)))
               (copy-from-record instance user)
               (update-user auth-pkg user)
               (set-user user)
diff --git a/lisp/service/rest-service.lisp b/lisp/service/rest-service.lisp
index eda0948..b01f7fa 100644
--- a/lisp/service/rest-service.lisp
+++ b/lisp/service/rest-service.lisp
@@ -37,5 +37,5 @@
 
 (defmethod sanitize-rest-json ((rest-service rest-service))
   (loop for slot in (intersection '(org-ckons-session::*session-key *table *where-expression pwd)
-                                  (org-ckons-core::map-slot-names rest-service)) do
-       (setf (slot-value rest-service slot) nil)))
+                                  (org-ckons-core::map-slot-names rest-service))
+        do (setf (slot-value rest-service slot) nil)))
diff --git a/lisp/service/users-service.lisp b/lisp/service/users-service.lisp
index fa56c53..5b16d46 100644
--- a/lisp/service/users-service.lisp
+++ b/lisp/service/users-service.lisp
@@ -26,8 +26,8 @@
       (let ((auth-pkg (make-instance 'auth-pkg)))
         (setf (users instance) (get-all-users auth-pkg))))
     (sanitize-rest-json instance)
-    (loop for user in (users instance) do
-         (sanitize-json user))))
+    (loop for user in (users instance)
+          do (sanitize-json user))))
 
 (defclass users/add-service (users/view-service)
   ((form :initarg :form
@@ -69,8 +69,8 @@
   (with-auth (instance users/add-service "users-modify")
     (with-bogenherr-database
       (let ((registration (make-instance 'registration)))
-        (loop for param in (sb-introspect:function-lambda-list #'users-add-submit-json) do
-             (setf (slot-value registration param) (symbol-value param)))
+        (loop for param in (sb-introspect:function-lambda-list #'users-add-submit-json)
+              do (setf (slot-value registration param) (symbol-value param)))
         (let* ((auth-pkg (make-instance 'auth-pkg))
                (id (insert-registration auth-pkg registration)))
           (setf registration (get-registration-by-id auth-pkg id)))
@@ -185,10 +185,10 @@
                           (progn
                             (loop for role-group in (union '("profile-admin")
                                                            (cl-ppcre:split "\\|" (role_groups registration))
-                                                           :test 'string=) do
-                                 (insert-user-role-group auth-pkg (make-instance 'user-role
-                                                                                 :user_id (id user)
-                                                                                 :role_group_name role-group)))
+                                                           :test 'string=)
+                                  do (insert-user-role-group auth-pkg (make-instance 'user-role
+                                                                                     :user_id (id user)
+                                                                                     :role_group_name role-group)))
                             (delete-registration auth-pkg hash)
                             (setf (session-value :message) "Registration completed successfully."))
                           (setf (session-value :errormsg) "Error while completing registration.")))
@@ -238,10 +238,10 @@
               (delete-role-groups auth-pkg user)
               (loop for role-group in (union '("profile-admin")
                                              (cl-ppcre:split "\\|" role_groups)
-                                             :test 'string=) do
-                   (insert-user-role-group auth-pkg (make-instance 'user-role
-                                                                   :user_id (id user)
-                                                                   :role_group_name role-group)))
+                                             :test 'string=)
+                    do (insert-user-role-group auth-pkg (make-instance 'user-role
+                                                                       :user_id (id user)
+                                                                       :role_group_name role-group)))
               (setf (session-value :message) "User saved successfully."))
             (setf (session-value :errormsg) "An error occured."))))))