Update of /project/lisppaste/cvsroot/lisppaste2 In directory common-lisp.net:/home/bmastenbrook/lisppaste2

Modified Files: README.lisp web-server.lisp Log Message: Partially roll back changes to help prevent misppastes to channels

Date: Fri Dec 10 16:34:26 2004 Author: bmastenbrook

Index: lisppaste2/README.lisp diff -u lisppaste2/README.lisp:1.17 lisppaste2/README.lisp:1.18 --- lisppaste2/README.lisp:1.17 Mon Nov 29 16:47:52 2004 +++ lisppaste2/README.lisp Fri Dec 10 16:34:25 2004 @@ -1,4 +1,4 @@ -;;;; $Id: README.lisp,v 1.17 2004/11/29 15:47:52 bmastenbrook Exp $ +;;;; $Id: README.lisp,v 1.18 2004/12/10 15:34:25 bmastenbrook Exp $ ;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/README.lisp,v $

;;;; See the LICENSE file for licensing information. @@ -45,5 +45,5 @@ :server "niven.freenode.net" :port 6667) (lisppaste:start-irc-notification - :channels '("#lisppaste" "#pearpc" "#fpc" "#hprog" "#concatenative" "#slate-users") + :channels '("#lisppaste" "#pearpc" "#fpc" "#hprog" "#concatenative" "#slate-users" "#swhack" "#ud")) :nickname "lisppaste2"))

Index: lisppaste2/web-server.lisp diff -u lisppaste2/web-server.lisp:1.72 lisppaste2/web-server.lisp:1.73 --- lisppaste2/web-server.lisp:1.72 Mon Nov 29 21:45:31 2004 +++ lisppaste2/web-server.lisp Fri Dec 10 16:34:26 2004 @@ -1,4 +1,4 @@ -;;;; $Id: web-server.lisp,v 1.72 2004/11/29 20:45:31 bmastenbrook Exp $ +;;;; $Id: web-server.lisp,v 1.73 2004/12/10 15:34:26 bmastenbrook Exp $ ;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/web-server.lisp,v $

;;;; See the LICENSE file for licensing information. @@ -276,6 +276,7 @@ (araneida:body-param "channel" (araneida:request-body request))) (substitute ## #/ (araneida::request-unhandled-part request) :test #'char=) + (concatenate 'string "#" (araneida:request-cookie request "CHANNEL")) (and *no-channel-pastes* "None") ))))) @@ -840,9 +841,12 @@ ((th :align left :width "0%" :nowrap "nowrap") "Select a channel:") (td ,@(if (or (string= default-channel "") (string= default-channel "None")) - `(,(format nil "To paste to an IRC channel on the network ~A, select a channel from the " - *irc-network-name*) - ((input :type "hidden" :name "channel" :value ,default-channel))) + `(((select :name "channel") + ,@(mapcar #'(lambda (e) + `((option :value ,e ,@(if (string-equal e default-channel) + '(:selected "SELECTED"))) + ,(encode-for-pre e))) + *channels*))) `(((select :name "channel") ,@(mapcar #'(lambda (e) `((option :value ,e ,@(if (string-equal e default-channel) @@ -851,9 +855,11 @@ (list* default-channel (if *no-channel-pastes* '("None"))))) (br) ,(format nil "To paste to a different IRC channel on the network ~A, select a channel from the " - *irc-network-name*))) - ((a :href ,(araneida:urlstring *channel-select-url*)) "channel list") - ".")))) + *irc-network-name*) + ((a :href ,(araneida:urlstring *channel-select-url*)) "channel list") + ".")) + + )))) (tr ((th :align left :width "0%" :nowrap "nowrap") "Enter your username:") (td ((input :type text :name "username"