Changeset b63fac in indico

Timestamp:

04/27/11 15:44:46 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

f45921

Parents:

53cd8a

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (04/27/11 14:55:00)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (04/27/11 15:44:46)

Message:

[FIX] HTTPS URL in YellowPay?

Location:

indico/MaKaC

Files:

• epayment.py (modified) (1 diff)
• plugins/EPayment/payPal/epayment.py (modified) (1 diff)
• plugins/EPayment/skipjack/epayment.py (modified) (1 diff)
• plugins/EPayment/worldPay/epayment.py (modified) (1 diff)
• plugins/EPayment/yellowPay/epayment.py (modified) (1 diff)
• webinterface/pages/registrationForm.py (modified) (1 diff)

indico/MaKaC/epayment.py

@@ -339 +339 @@
         return self._enabled
 
-    def getFormHTML(self, price, currency, registrant, lang = "en_US"):
+    def getFormHTML(self, price, currency, registrant, lang = "en_US", secure=False):
         """
         Returns the html form that will be used to send the information to the epayment server.

indico/MaKaC/plugins/EPayment/payPal/epayment.py

@@ -65 +65 @@
         self._business= business
 
-
-
-    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US"):
+    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US", secure=False):
         url_return=localUrlHandlers.UHPayConfirmPayPal.getURL(registrant)
         url_cancel_return=localUrlHandlers.UHPayCancelPayPal.getURL(registrant)

indico/MaKaC/plugins/EPayment/skipjack/epayment.py

@@ -98 +98 @@
         self.setTextCallBackCancelled(data.get("CPResponse", "epayment"))
 
-    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US"):
+    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US", secure=False):
         """build the registration form to be send to skipjack"""
         url_confirm=localUrlHandlers.UHPayConfirmSkipjack.getURL()

indico/MaKaC/plugins/EPayment/worldPay/epayment.py

@@ -105 +105 @@
         self.setTextCallBackCancelled(data.get("CPResponse", "epayment"))
 
-    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US"):
+    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US", secure=False):
         """build the registration form to be send to worldPay"""
         url_confirm=localUrlHandlers.UHPayConfirmWorldPay.getURL()

indico/MaKaC/plugins/EPayment/yellowPay/epayment.py

@@ -82 +82 @@
 
 
-    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US"):
+    def getFormHTML(self,prix,Currency,conf,registrant,lang = "en_US", secure=False):
         l=[]
         l.append("%s=%s"%("confId",conf.getId()))

indico/MaKaC/webinterface/pages/registrationForm.py

@@ -2596 +2596 @@
                 %s
                 </tr>
-                """%(m.getTitle(),m.getFormHTML(self._registrant.getTotal(),regForm.getCurrency(),self._conf,self._registrant, lang = self._rh._getSession().getLang()))
+                """%(m.getTitle(),m.getFormHTML(self._registrant.getTotal(),regForm.getCurrency(),self._conf,self._registrant, lang = self._rh._getSession().getLang(), secure=self._rh._req.is_https()))
         #forms=forms+"</table>"