[bknr-cvs] r1934 - branches/xml-class-rework/projects/bos/worldpay-test

[bknr at bknr.net]

Author: hhubner
Date: 2006-03-17 10:59:16 -0500 (Fri, 17 Mar 2006)
New Revision: 1934

Modified:
   branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp
   branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp
Log:
Repair language marks for certificates.
Repair logout button in satellite application.


Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp
===================================================================
--- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp	2006-03-16 18:31:23 UTC (rev 1933)
+++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp	2006-03-17 15:59:16 UTC (rev 1934)
@@ -36,10 +36,9 @@
   (mapc #'emit-template-node children))
 
 (define-bknr-tag generate-cert ()
-  (with-template-vars (gift email name address lang)
-    (format t "generate-cert: param 'lang': ~A template-var :language: ~A template-var :lang: ~A~%" lang (get-template-var :language) (get-template-var :lang))
+  (with-template-vars (gift email name address)
     (let ((contract (find-store-object (parse-integer (get-template-var :contract-id)))))
-      (contract-issue-cert contract name :address address :language lang)
+      (contract-issue-cert contract name :address address :language (session-variable :language))
       (bknr.web::redirect-request :target (if gift "index"
 					      (format nil "profil_setup?name=~A&email=~A&sponsor-id=~A"
 						      (uriencode-string name) (uriencode-string email)

Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp
===================================================================
--- branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp	2006-03-16 18:31:23 UTC (rev 1933)
+++ branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp	2006-03-17 15:59:16 UTC (rev 1934)
@@ -108,8 +108,8 @@
   (with-query-params (req logout)
     (when logout
       (bknr.web::drop-session (bknr-request-session req))))
-  (redirect "/infosystem/satellitenkarte.htm"
-	    req))
+  (let ((language (session-variable :language)))
+    (redirect #?"/infosystem/$(language)/satellitenkarte.htm" req)))
 
 (defclass certificate-handler (object-handler)
   ()