Close #640: As we have a certificat only for one domain name, we have to use this...

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1528 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index b6a6a3b..8a8b6fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@ Bug/Wish:
     * Carnet:
         - #510: Use RSS hash to get iCal                                   -FRU
 
+    * Core:
+        - #640: Always switch to the good secure server                    -FRU
+
     * Emails:
         - #595: Update antispam description                                -FRU
 

diff --git a/configs/platal.ini b/configs/platal.ini
index e9de050..7d79051 100644 (file)
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -1,6 +1,7 @@
 [Core]
 locale   = "fr_FR.UTF-8"
 timezone = "Europe/Paris"
+secure_domain = ""
 
 [Banana]
 server = "localhost"

diff --git a/templates/core/password_prompt.tpl b/templates/core/password_prompt.tpl
index fdc54a8..ba27a4c 100644 (file)
--- a/templates/core/password_prompt.tpl
+++ b/templates/core/password_prompt.tpl
@@ -68,8 +68,8 @@ Si tu n'es pas {insert name="getName"}, change le login ci-dessous, ou rends-toi
   <table class="bicol" cellpadding="4" summary="Formulaire de login">
     <tr>
       <th colspan="2">{if $smarty.server.HTTPS}{icon name=lock}{/if} Identification
-      {if !$smarty.server.HTTPS}
-      (<a href="{$globals->baseurl|replace:"http":"https"}/{$platal->pl_self()}">{icon name=lock_add} Passer en connexion sécurisée</a>)
+      {if !$smarty.server.HTTPS && #globals.core.secure_domain#}
+      (<a href="https://{#globals.core.secure_domain#}{$smarty.server.REQUEST_URI}">{icon name=lock_add} Passer en connexion sécurisée</a>)
       {/if}
       </th>
     </tr>