Changeset 3271
- Timestamp:
- 06/15/08 14:24:57 (7 months ago)
- Files:
-
- trunk/bknr/web/src/web/handlers.lisp (modified) (1 diff)
- trunk/bknr/web/src/web/sessions.lisp (modified) (2 diffs)
- trunk/bknr/web/src/web/user-handlers.lisp (modified) (1 diff)
- trunk/bknr/web/src/web/web-utils.lisp (modified) (2 diffs)
- trunk/projects/bos/web/allocation-area-handlers.lisp (modified) (2 diffs)
- trunk/projects/bos/web/map-handlers.lisp (modified) (1 diff)
- trunk/projects/bos/web/poi-handlers.lisp (modified) (1 diff)
- trunk/projects/bos/web/sponsor-handlers.lisp (modified) (1 diff)
- trunk/projects/bos/web/web-utils.lisp (modified) (1 diff)
- trunk/projects/bos/web/webserver.lisp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/bknr/web/src/web/handlers.lisp
r3270 r3271 78 78 (if (and (boundp 'hunchentoot::*request*) 79 79 hunchentoot::*request* 80 (hunchentoot:header-in :host))81 (header-in :host)80 (hunchentoot:header-in* :host)) 81 (header-in* :host) 82 82 "localhost")) 83 83 trunk/bknr/web/src/web/sessions.lisp
r3270 r3271 26 26 (host (bknr-session-host session)) 27 27 (url (script-name*)) 28 (referer (header-in :referer))29 (user-agent (header-in :user-agent))28 (referer (header-in* :referer)) 29 (user-agent (header-in* :user-agent)) 30 30 (time (get-universal-time))) 31 31 (prog1 … … 48 48 (host (bknr-session-host session)) 49 49 (url (script-name*)) 50 (referer (header-in :referer))50 (referer (header-in* :referer)) 51 51 (time (get-universal-time))) 52 52 (make-event 'web-server-error-event trunk/bknr/web/src/web/user-handlers.lisp
r2424 r3271 27 27 (defmethod handle ((handler logout-handler)) 28 28 (setf (session-value 'bknr-session) nil) 29 (format t "url: ~A referer: ~A~%" (query-param "url") (header-in :referer))29 (format t "url: ~A referer: ~A~%" (query-param "url") (header-in* :referer)) 30 30 (let ((url (or (query-param "url") 31 (header-in :referer))))31 (header-in* :referer)))) 32 32 (if url 33 33 (redirect url) trunk/bknr/web/src/web/web-utils.lisp
r3270 r3271 25 25 (unless (aux-request-value 'uploaded-files) 26 26 (setf (aux-request-value 'uploaded-files) 27 (let ((uploads (remove-if-not #'listp (post-parameters ) :key #'cdr)) retval)27 (let ((uploads (remove-if-not #'listp (post-parameters*) :key #'cdr)) retval) 28 28 (dolist (upload-info uploads) 29 29 (destructuring-bind (name pathname original-filename content-type) upload-info … … 66 66 67 67 (defun query-params (&key (get t) (post t)) 68 (append (when get (get-parameters ))69 (when post (post-parameters ))))68 (append (when get (get-parameters*)) 69 (when post (post-parameters*)))) 70 70 71 71 (defun query-param (param-name &key (get t) (post t)) trunk/projects/bos/web/allocation-area-handlers.lisp
r2667 r3271 159 159 (encode-urlencoded "Choose lower right point of allocation area") 160 160 (encode-urlencoded (format nil "~A?left=~A&top=~A&" 161 (hunchentoot:request-uri )161 (hunchentoot:request-uri*) 162 162 x y))))) 163 163 (t … … 180 180 start-x start-y 181 181 (encode-urlencoded "Choose upper left point of allocation area") 182 (encode-urlencoded (format nil "~A?" (hunchentoot:request-uri )))))))182 (encode-urlencoded (format nil "~A?" (hunchentoot:request-uri*))))))) 183 183 184 184 (defmethod handle-form ((handler create-allocation-area-handler) (action (eql :upload))) trunk/projects/bos/web/map-handlers.lisp
r2644 r3271 112 112 (html (:h2 "this square meter has not been sold yet"))))) 113 113 (with-bos-cms-page (:title "Browsing tile") 114 (:a ((:a :href (hunchentoot:request-uri ))114 (:a ((:a :href (hunchentoot:request-uri*)) 115 115 ((:img :width "360" :ismap "ismap" :height "360" :border "0" :src (tile-url tile tile-x tile-y))))) 116 116 (map-navigator tile-x tile-y "/enlarge-overview/"))))) trunk/projects/bos/web/poi-handlers.lisp
r3113 r3271 96 96 (cmslink (format nil "map-browser/~A/~A?chosen-url=~A" 97 97 (first (poi-area poi)) (second (poi-area poi)) 98 (encode-urlencoded (format nil "~A?action=save&" (hunchentoot:request-uri ))))98 (encode-urlencoded (format nil "~A?action=save&" (hunchentoot:request-uri*)))) 99 99 "[relocate]")) 100 100 (t 101 101 (cmslink (format nil "map-browser/?chosen-url=~A" 102 (encode-urlencoded (format nil "~A?action=save&" (hunchentoot:request-uri ))))102 (encode-urlencoded (format nil "~A?action=save&" (hunchentoot:request-uri*)))) 103 103 "[choose]"))))) 104 104 (:tr (:td "icon") trunk/projects/bos/web/sponsor-handlers.lisp
r2939 r3271 193 193 (unless changed 194 194 (html (:p "No changes have been made"))) 195 (html (cmslink (hunchentoot:request-uri )195 (html (cmslink (hunchentoot:request-uri*) 196 196 "Return to sponsor profile"))))) 197 197 trunk/projects/bos/web/web-utils.lisp
r2644 r3271 50 50 (loop for (language-symbol language-name) in (website-languages) 51 51 do (labels ((show-language-link () 52 (html (cmslink (format nil "~A?language=~A" (hunchentoot:request-uri ) language-symbol)52 (html (cmslink (format nil "~A?language=~A" (hunchentoot:request-uri*) language-symbol) 53 53 (:princ-safe language-name))))) 54 54 (if (equal (hunchentoot:session-value :language) language-symbol) trunk/projects/bos/web/webserver.lisp
r3261 r3271 79 79 present in the HTTP request. Header decoding is done according to RFC2616, considering individual 80 80 language preference weights." 81 (let ((accept-language (hunchentoot:header-in :accept-language)))81 (let ((accept-language (hunchentoot:header-in* :accept-language))) 82 82 (dolist (language (mapcar #'car 83 83 (sort (mapcar #'(lambda (language-spec-string) … … 170 170 171 171 (defmethod authorize :after ((authorizer bos-authorizer)) 172 (let ((new-language (or (language-from-url (hunchentoot:request-uri ))172 (let ((new-language (or (language-from-url (hunchentoot:request-uri*)) 173 173 (query-param "language"))) 174 174 (current-language (hunchentoot:session-value :language)))
