Changeset 3304

Show
Ignore:
Timestamp:
06/24/08 07:24:53 (7 months ago)
Author:
hans
Message:

Hunchentoot and BKNR framework update fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/projects/lisp-ecoop/src/handlers.lisp

    r2660 r3304  
    7070  (unless (submission-edit-permitted-p submission) 
    7171    (error "can't edit this submission")) 
    72   (ecase (request-method
     72  (ecase (request-method*
    7373    (:post 
    7474     (when (request-uploaded-file "document") 
  • trunk/projects/lisp-ecoop/src/init.lisp

    r2531 r3304  
    22 
    33(defun startup () 
    4   (when *store* 
    5     (close-store)) 
     4  (close-store) 
    65  (make-instance 'store 
    76                 :directory *store-directory* 
     
    1615  #+(or) 
    1716  (bknr.cron:start-cron) 
    18    
     17 
    1918  (publish-lisp-ecoop) 
    2019 
  • trunk/projects/lisp-ecoop/src/tags.lisp

    r2873 r3304  
    3333      (html (:h2 "can't edit this profile")) 
    3434      (return-from profile-editor)) 
    35     (when (eq :post (request-method)) 
     35    (when (eq :post (request-method*)) 
    3636      (with-query-params (action) 
    3737        (format t ";; ACTION ~A~%" action) 
     
    7171                  (html ((:script :language "JavaScript") "alert('Invalid file format of uploaded, only PDF files are accepted')"))))))) 
    7272      (when (request-uploaded-file "picture") 
    73         (let ((picture (import-image (pathname (request-uploaded-file "picture"))))) 
     73        (let* ((upload (request-uploaded-file "picture")) 
     74               (picture (import-image (pathname (upload-pathname upload)) 
     75                                      :type (pathname-type (upload-original-filename upload))))) 
    7476          (with-transaction ("updating participant picture") 
    7577            (when (participant-picture participant) 
     
    113115      (html (:h2 "can't edit this submission")) 
    114116      (return-from submission-editor)) 
    115     (when (eq :post (request-method)) 
     117    (when (eq :post (request-method*)) 
    116118      (with-query-params (action) 
    117119        (case (make-keyword-from-string action) 
     
    194196                  (dolist (participant (set-difference (class-instances 'participant) submitters)) 
    195197                    (html (:li ((:a :href (format nil "~A?add-submitter-id=~A" 
    196                                                   (script-name
     198                                                  (script-name*
    197199                                                  (store-object-id participant))) 
    198200                                (:princ-safe (user-full-name participant))))))))) 
     
    201203                 (:ul 
    202204                  (dolist (participant submitters) 
    203                     (html (:li ((:a :href (format nil "~A?remove-submitter-id=~A" (script-name) (store-object-id participant))) 
     205                    (html (:li ((:a :href (format nil "~A?remove-submitter-id=~A" (script-name*) (store-object-id participant))) 
    204206                                (:princ-safe (user-full-name participant)))))))))))))) 
    205207 
     
    301303      (t 
    302304       (html ((:form :method "post" :action (website-make-path *website* "logout")) 
    303               ((:input :type "hidden" :name "url" :value (script-name))) 
     305              ((:input :type "hidden" :name "url" :value (script-name*))) 
    304306              (:div "Logged in as " :br 
    305307                    ((:a :href (format-object-id "/edit-profile/~A" user)) 
     
    317319 
    318320(define-bknr-tag schedule-submission () 
    319   (when (eq :post (request-method)) 
     321  (when (eq :post (request-method*)) 
    320322    (with-query-params (date time duration submission freetext) 
    321323      (let ((start (parse-time (format nil "~A ~A" date time) :default-zone -2)) ; XXX hardcoded time zone