Merge branch 'xorg/maint' into xorg/master

diff --git a/ChangeLog b/ChangeLog
index e490c72..2f0c9cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
 ================================================================================
+VERSION 1.1.6                                                         XX XX XXXX
+
+From 1.1.5 branch:
+
+    * Search:
+        - #1622: Fixes address search                                      -JAC
+
+    * XnetEvent:
+        - #1621: Properly computes event participants for the whole event  -JAC
+
+================================================================================
 VERSION 1.1.5                                                         31 05 2012
 
 Bug/Wish:

diff --git a/classes/profile.php b/classes/profile.php
index b11e31d..593568c 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -171,6 +171,13 @@ class Profile implements PlExportable
         $this->visibility = $visibility;
     }
 
+    public function __destruct()
+    {
+        // Need to delete objects allocated by the profile
+        // http://www.php.net/manual/en/function.unset.php#98692
+        unset($this->owner);
+    }
+
     public function id()
     {
         return $this->pid;

diff --git a/core b/core
index df1ec68..e617a93 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit df1ec683f930734d7532bd3dc3b10c46da947748
+Subproject commit e617a9308d1b8523fe76e8ae274b2eb5dee325a9

diff --git a/modules/payment.php b/modules/payment.php
index 623aad2..1291ef0 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -20,17 +20,19 @@
  ***************************************************************************/
 
 /* sort en affichant une erreur */
-function cb_erreur($text) {
+function cb_erreur($text, $conf_title="") {
     global $globals;
     echo "Error: ".$text."\n";
     $mymail = new PlMailer();
     $mymail->addTo($globals->money->email);
     $mymail->setFrom("webmaster@" . $globals->mail->domain);
     $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)");
-    $mymail->setTxtBody("raison de l'erreur : ".$text."\n".
-                        "paiement : $conf_title \n\n".
-                        "dump de REQUEST :\n".
-                        var_export($_REQUEST,true));
+    $content = "raison de l'erreur : " . $text . "\n";
+    if ($conf_title != "") {
+        $content = $content."paiement : ".$conf_title."\n";
+    }
+    $content = $content . "dump de REQUEST :\n" . var_export($_REQUEST, true);
+    $mymail->setTxtBody($content);
     $mymail->send();
     echo "Notification sent.\n";
     exit;
@@ -270,7 +272,7 @@ class PaymentModule extends PLModule
 
         /* on extrait le code de retour */
         if (Env::v('vads_result') != '00') {
-            cb_erreur('erreur lors du paiement : ?? (' . Env::v('vads_result') . ')');
+            cb_erreur('erreur lors du paiement : ?? (' . Env::v('vads_result') . ')', $conf_title);
         }
 
         /* on fait l'insertion en base de donnees */
@@ -588,7 +590,7 @@ class PaymentModule extends PLModule
 
         // adds a column with the start date of the linked event if there is one
         $table_editor->add_option_table('group_events', 'group_events.paiement_id = t.id');
-        $table_editor->add_option_field('group_events.debut', 'related_event', 'évènement', 'timestamp');
+        $table_editor->add_option_field('group_events.archive', 'related_event', 'évènement archivé ?', 'tinyint');
 
         $table_editor->apply($page, $action, $id);
     }

diff --git a/modules/platal.php b/modules/platal.php
index baa18b1..3c4776a 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -370,9 +370,14 @@ class PlatalModule extends PLModule
         $mymail->setFrom('"Gestion des mots de passe" <support+password@' . $globals->mail->domain . '>');
         if (is_null($to)) {
             $mymail->addTo($user);
-            $mymail->addTo($inactives_to);
+            $log_to = $user->bestEmail();
+            if (!is_null($inactives_to)) {
+                $log_to = $inactives_to . ', ' . $log_to;
+                $mymail->addTo($inactives_to);
+            }
         } else {
             $mymail->addTo($to);
+            $log_to = $to;
         }
         $mymail->setSubject("Ton certificat d'authentification");
         $mymail->setTxtBody("Visite la page suivante qui expire dans six heures :
@@ -388,7 +393,7 @@ Email envoyé à ".Env::v('login') . (is_null($to) ? '' : '
 Adresse de secours : ' . $to));
         $mymail->send();
 
-        S::logger($user->id())->log('recovery', is_null($to) ? $inactives_to . ', ' . $user->bestEmail() : $to);
+        S::logger($user->id())->log('recovery', $log_to);
     }
 
     function handler_recovery_ext($page)

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index 74d07d1..d20e113 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -73,7 +73,11 @@
     <td>
       <a href="admin/payments">Paiements</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
+      <a href="admin/payments/methods">Méthodes de paiement</a>
+      &nbsp;&nbsp;|&nbsp;&nbsp;
       <a href="admin/reconcile">Virements</a>
+      &nbsp;&nbsp;|&nbsp;&nbsp;
+      <a href="admin/reconcile/bankaccounts">RIBs</a>
     </td>
   </tr>
   <tr class="pair">