Changeset 15437 in project for release

Timestamp:

08/13/09 17:58:14 (12 years ago)

Author:

sjamaan

Message:

Implement user authentication

Location:

release/4/qwiki/trunk

Files:

• qwiki-svn.scm (modified) (1 diff)
• qwiki.scm (modified) (3 diffs)

release/4/qwiki/trunk/qwiki-svn.scm

@@ -87 +87 @@
               (qwiki-repos-username) (qwiki-repos-password)))
 
-(define (store-changes! source-path message)
-  (define (get-info path)
-    (let ((info '()))
-      (svn-client-info path
-                       svn-opt-revision-unspecified
-                       svn-opt-revision-unspecified
-                       (lambda (path i) (set! info (cons i info)))
-                       #f (qwiki-repos-username) (qwiki-repos-password))
-      (and (not (null? info)) (car info))))
-  (let loop ((source-path source-path))
-    (if (get-info source-path)
-        (svn-commit source-path
-                    (qwiki-repos-username) (qwiki-repos-password)
-                    message)
-        (begin
-          (loop (pathname-directory source-path))  ; Add parent dirs if needed
-          (svn-add source-path (qwiki-repos-username) (qwiki-repos-password))
-          (svn-commit source-path
-                      (qwiki-repos-username) (qwiki-repos-password)
-                      message)))))
+(define (store-changes! source-path message username password)
+  (let* ((user (or username (qwiki-repos-username)))
+         (pass (or password (qwiki-repos-password)))
+         (get-info
+          (lambda (path)
+            (let ((info '()))
+              (svn-client-info path
+                               svn-opt-revision-unspecified
+                               svn-opt-revision-unspecified
+                               (lambda (path i) (set! info (cons i info)))
+                               #f user pass)
+              (and (not (null? info)) (car info))))))
+   (let loop ((source-path source-path))
+     (if (get-info source-path)
+         (svn-commit source-path user pass message)
+         (begin
+           (loop (pathname-directory source-path)) ; Add parent dirs if needed
+           (svn-add source-path user pass)
+           (svn-commit source-path user pass message))))))
 
 )

release/4/qwiki/trunk/qwiki.scm

@@ -136 +136 @@
                           (with-input-from-file source-file read-string))
                      ""))
+         (comment (alist-ref 'comment postdata eq? ""))
+         (username (alist-ref 'username postdata eq? ""))
+         (password (alist-ref 'password postdata eq? ""))
+         (auth (alist-ref 'auth postdata eq?))
          ;; TODO: Clean this up, maybe put it in a transformation rule so
          ;; it can be extended by plugins.  The names of the buttons are
@@ -146 +150 @@
                                 ,(wiki-parse source))
                           "")
+                     (p "username: " ,username " password: " ,password " auth: " ,auth)
                      (form (@ (method "post"))
-                           (textarea (@ (name "source"))
-                                     ,source)
+                           (label "Article contents:"
+                                  (textarea (@ (name "source"))
+                                            ,source))
+                           (label "Description of your changes:"
+                                  (textarea (@ (name "comment"))
+                                            ,comment))
+                           (label "I would like to authenticate"
+                                  (input (@ (type "checkbox")
+                                            (name "auth")
+                                            ,@(if auth
+                                                  '((checked "checked"))
+                                                  '()))))
+                           (label "Username:"
+                                  (input (@ (type "text")
+                                            (name "username")
+                                            (value ,username))))
+                           (label "Password:"
+                                  (input (@ (type "password")
+                                            (name "password")
+                                            (value ,password))))
                            (input (@ (type "submit")
                                      (name "save")
@@ -158 +181 @@
         (begin
           (with-output-to-path source-file (lambda () (display source)))
-          (store-changes! source-file "qwiki commit")
+          (store-changes! source-file comment
+                          (and auth username) (and auth password))
           (redirect-to-qwiki-page req action: "show"))
         (send-content content))))