[bknr-cvs] hans changed trunk/bknr/

[BKNR Commits]

Revision: 3995
Author: hans
URL: http://bknr.net/trac/changeset/3995

Fix URL generation for redirect to login page.

U   trunk/bknr/modules/text/package.lisp
U   trunk/bknr/web/src/packages.lisp
U   trunk/bknr/web/src/web/handlers.lisp

Modified: trunk/bknr/modules/text/package.lisp
===================================================================
--- trunk/bknr/modules/text/package.lisp	2008-10-14 20:55:19 UTC (rev 3994)
+++ trunk/bknr/modules/text/package.lisp	2008-10-15 20:10:29 UTC (rev 3995)
@@ -18,6 +18,7 @@
         :alexandria)
   (:shadowing-import-from :bknr.indices array-index)
   (:shadowing-import-from :cl-interpol quote-meta-chars)
+  (:shadowing-import-from :alexandria #:copy-stream #:copy-file)
   (:export
    ;; billboards
    #:list-billboards-page

Modified: trunk/bknr/web/src/packages.lisp
===================================================================
--- trunk/bknr/web/src/packages.lisp	2008-10-14 20:55:19 UTC (rev 3994)
+++ trunk/bknr/web/src/packages.lisp	2008-10-15 20:10:29 UTC (rev 3995)
@@ -164,6 +164,7 @@
   (:shadowing-import-from :cl-interpol #:quote-meta-chars)
   (:shadowing-import-from :hunchentoot #:host)
   (:shadowing-import-from :alexandria #:array-index)
+  (:shadowing-import-from :alexandria #:copy-stream #:copy-file)
   (:export #:*user*
 	   #:with-http-request
 	   #:with-http-body
@@ -404,6 +405,7 @@
 	:bknr.user)
   (:shadowing-import-from :cl-interpol #:quote-meta-chars)
   (:shadowing-import-from :bknr.indices #:array-index)
+  (:shadowing-import-from :alexandria #:copy-stream #:copy-file)
   (:export #:imageproc
 	   #:define-imageproc-handler
 	   #:image-handler			; plain images only

Modified: trunk/bknr/web/src/web/handlers.lisp
===================================================================
--- trunk/bknr/web/src/web/handlers.lisp	2008-10-14 20:55:19 UTC (rev 3994)
+++ trunk/bknr/web/src/web/handlers.lisp	2008-10-15 20:10:29 UTC (rev 3995)
@@ -91,7 +91,7 @@
       path))
 
 (defmethod website-make-path ((website website) path)
-  (format nil "~A~A" (website-base-href website) (relative path)))
+  (format nil "http://~A/~A" (tbnl:host) (relative path)))
 
 (defgeneric publish-handler (website handler)
   (:documentation "Publish HANDLER on WEBSITE, thereby adding it to
@@ -362,7 +362,7 @@
          (t
           (setf (session-value :login-redirect-uri)
                 (redirect-uri (parse-uri (script-name*))))
-          (redirect (website-make-path *website* "login")))))
+          (redirect "/login"))))
       (t
        'error-404))))