Merge branch 'platal-0.9.17'

Conflicts:

	plugins/compiler.checkpasswd.php
	templates/events/rss.tpl
	templates/xnetgrp/announce-rss.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index f82cc9f..e8b7952 100644 (file)
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -299,7 +299,7 @@ function getType(char) {
     }
 }
 
-function checkPassword(box) {
+function checkPassword(box, okLabel) {
     var prev = 0;
     var prop = 0;
     var pass = box.value;
@@ -349,8 +349,10 @@ function checkPassword(box) {
                     .animate({ backgroundColor: bgcolor }, 750);
     var submitButton = $(":submit[@name='" + passwordprompt_submit + "']");
     if (ok && pass.length >= 6) {
+        submitButton.attr("value", okLabel);
         submitButton.removeAttr("disabled");
     } else {
+        submitButton.attr("value", "Mot de passe trop faible");
         submitButton.attr("disabled", "disabled");
     }
 }

diff --git a/modules/payment.php b/modules/payment.php
index 7d2493c..7545ae9 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -89,12 +89,12 @@ class PaymentModule extends PLModule
     {
         return array(
             'payment'               => $this->make_hook('payment', AUTH_MDP),
-            'payment/cyber_return'  => $this->make_hook('cyber_return',  AUTH_PUBLIC),
-            'payment/paypal_return' => $this->make_hook('paypal_return',  AUTH_PUBLIC),
+            'payment/cyber_return'  => $this->make_hook('cyber_return',  AUTH_PUBLIC, 'user', NO_HTTPS),
+            'payment/paypal_return' => $this->make_hook('paypal_return',  AUTH_PUBLIC, 'user', NO_HTTPS),
             '%grp/paiement'              => $this->make_hook('xnet_payment', AUTH_MDP),
             '%grp/payment'               => $this->make_hook('xnet_payment', AUTH_MDP),
-            '%grp/payment/cyber_return'  => $this->make_hook('cyber_return', AUTH_PUBLIC),
-            '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC),
+            '%grp/payment/cyber_return'  => $this->make_hook('cyber_return', AUTH_PUBLIC, 'user', NO_HTTPS),
+            '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC, 'user', NO_HTTPS),
             'admin/payments'        => $this->make_hook('admin', AUTH_MDP, 'admin'),
 
         );

diff --git a/templates/events/rss.tpl b/templates/events/rss.tpl
deleted file mode 100644 (file)
index 1caa179..0000000
--- a/templates/events/rss.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{**************************************************************************}
-{*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
-{*  http://opensource.polytechnique.org/                                  *}
-{*                                                                        *}
-{*  This program is free software; you can redistribute it and/or modify  *}
-{*  it under the terms of the GNU General Public License as published by  *}
-{*  the Free Software Foundation; either version 2 of the License, or     *}
-{*  (at your option) any later version.                                   *}
-{*                                                                        *}
-{*  This program is distributed in the hope that it will be useful,       *}
-{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
-{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
-{*  GNU General Public License for more details.                          *}
-{*                                                                        *}
-{*  You should have received a copy of the GNU General Public License     *}
-{*  along with this program; if not, write to the Free Software           *}
-{*  Foundation, Inc.,                                                     *}
-{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
-{*                                                                        *}
-{**************************************************************************}
-{if $article->photo}
-<div style="float: left; padding-right: 0.5em">
-  <img src="{#globals.baseurl#}/events/photo/{$article->id}" alt="{$article->title|htmlentities}" />
-</div>
-{/if}
-<div>{if $article->wiki}{$article->texte|miniwiki}{else}{$article->texte}{/if}</div>
-{if $article->post_id neq -1}
-<div style="clear: both">
-  <br />
-  <a href="{#globals.baseurl#}/banana/{#globals.banana.event_reply#|default:#globals.banana.event_forum#}/read/{$article->post_id}">
-  {icon name=comments full=true} Suivre la discussion
-  </a>
-</div>
-{/if}
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/googleapps/index.tpl b/templates/googleapps/index.tpl
index 0b8cedd..fdecfc7 100644 (file)
--- a/templates/googleapps/index.tpl
+++ b/templates/googleapps/index.tpl
@@ -111,7 +111,7 @@
             </tr>
             <tr>
               <td class="titre">Sécurité</td>
-              <td>{checkpasswd prompt="nouveau" submit="create_account"}</td>
+              <td>{checkpasswd prompt="nouveau" submit="create_account" text="Créer mon compte !"}</td>
             </tr>
           </table>
           </form>
@@ -380,7 +380,7 @@
               </tr>
               <tr>
                 <td class="titre">Sécurité</td>
-                <td>{checkpasswd prompt="nouveau" submit="create_account"}</td>
+                <td>{checkpasswd prompt="nouveau" submit="create_account" text="Créer mon compte !"}</td>
               </tr>
               <tr>
                 <td></td>

diff --git a/templates/platal/acces_smtp.tpl b/templates/platal/acces_smtp.tpl
index 7e21a31..995d133 100644 (file)
--- a/templates/platal/acces_smtp.tpl
+++ b/templates/platal/acces_smtp.tpl
@@ -82,7 +82,7 @@
     </tr>
     <tr>
       <td class="titre">Sécurité</td>
-      <td>{checkpasswd prompt="smtppass1" submit="valid"}</td>
+      <td>{checkpasswd prompt="smtppass1" submit="valid" text="Valider"}</td>
     </tr>
     <tr>
       <td colspan="2" class="center">

diff --git a/templates/xnetgrp/announce-rss.tpl b/templates/xnetgrp/announce-rss.tpl
deleted file mode 100644 (file)
index e1172d7..0000000
--- a/templates/xnetgrp/announce-rss.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{**************************************************************************}
-{*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
-{*  http://opensource.polytechnique.org/                                  *}
-{*                                                                        *}
-{*  This program is free software; you can redistribute it and/or modify  *}
-{*  it under the terms of the GNU General Public License as published by  *}
-{*  the Free Software Foundation; either version 2 of the License, or     *}
-{*  (at your option) any later version.                                   *}
-{*                                                                        *}
-{*  This program is distributed in the hope that it will be useful,       *}
-{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
-{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
-{*  GNU General Public License for more details.                          *}
-{*                                                                        *}
-{*  You should have received a copy of the GNU General Public License     *}
-{*  along with this program; if not, write to the Free Software           *}
-{*  Foundation, Inc.,                                                     *}
-{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
-{*                                                                        *}
-{**************************************************************************}
-{if $article->photo}
-<div style="float: left; padding-right: 0.5em">
-  <img src="{#globals.baseurl#}/{$asso.diminutif}/announce/photo/{$article->id}" alt="{$article->titre|strip_tags}" />
-</div>
-{/if}
-<div>{$article->texte|miniwiki}{if $article->contacts}<br/><br/><strong>Contacts&nbsp;:</strong><br/>{$article->contacts|miniwiki}{/if}</div>
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}