Merge xorg/maint into xorg/master.

diff --git a/ChangeLog b/ChangeLog
index 9ccfaeb..cc7b5b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 ================================================================================
+VERSION 1.1.8                                                         XX XX XXXX
+
+================================================================================
 VERSION 1.1.7                                                         18 02 2013
 
     * Payments:

diff --git a/core b/core
index 1256fe0..a315ff7 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1256fe0522a97b7a8ed8a1e12a22378cb6503fbc
+Subproject commit a315ff7281b69e71aca8670df8c8b6063dddee9d

diff --git a/htdocs/images/ax_mail_header.jpg b/htdocs/images/ax_mail_header.jpg
index ab98f38..000520f 100644 (file)
Binary files a/htdocs/images/ax_mail_header.jpg and b/htdocs/images/ax_mail_header.jpg differ

diff --git a/htdocs/images/ax_mail_header_normal.jpg b/htdocs/images/ax_mail_header_normal.jpg
new file mode 100644 (file)
index 0000000..ab98f38
Binary files /dev/null and b/htdocs/images/ax_mail_header_normal.jpg differ

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index e08a723..3899308 100644 (file)
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -198,6 +198,7 @@ class WatchBirthday extends WatchOperation
 
     protected function buildCondition(Watch $watch)
     {
+        $not_dead = new PFC_Not(new UFC_Dead());
         $select_date = new PFC_OR(new UFC_Birthday('=', time()),
                                   new PFC_And(new UFC_Birthday('<=', time() + self::WATCH_LIMIT),
                                               new UFC_Birthday('>', $watch->date() + self::WATCH_LIMIT)));
@@ -210,7 +211,7 @@ class WatchBirthday extends WatchOperation
                                            new UFC_Promo('<=', $profile->mainGrade(), $profile->yearpromo() + 1)),
                                $watch->groupCondition());
         }
-        return new PFC_And($select_date, $cond);
+        return new PFC_And($not_dead, $select_date, $cond);
     }
 
     public function getOrder()

diff --git a/modules/payment.php b/modules/payment.php
index a74cd68..1703917 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -615,10 +615,10 @@ class PaymentModule extends PLModule
         $table_editor->add_sort_field('id', true);
         $table_editor->describe('ts_initiated', 'ts_initiated', true, false);
         $table_editor->describe('commission', 'commission', true, false);
-        $table_editor->describe('pkey', 'pkey', true, false);
-        $table_editor->describe('comment', 'comment', true, false);
+        $table_editor->describe('pkey', 'pkey', true, true);
+        $table_editor->describe('comment', 'comment', true, true);
         $table_editor->describe('recon_id', 'recon_id', true, false);
-        $table_editor->describe('display', 'display', true, false);
+        $table_editor->describe('display', 'display', true, true);
         $table_editor->apply($page, $action, $id);
         $page->assign('addonly', 'addonly');     // don't show modification features, only add feature
     }

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index 5139844..6f8ad08 100644 (file)
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -352,7 +352,7 @@ class Survey
         if (!S::user()->checkPerms(PERMS_USER)) {
             $where .=  XDB::format(' AND mode = {?}', self::MODE_ALL);
         }
-        $sql = 'SELECT id, title, end, mode
+        $sql = 'SELECT id, title, uid, end, mode
                   FROM surveys
                  WHERE '.$where.'
               ORDER BY end DESC;';

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 88c9f32..0a321b6 100644 (file)
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -59,11 +59,13 @@
     var form = document.forms.form_mail;
     var toc = "";
     var ccc = "";
-    for (var i = 0 ; i < form['to_contacts[]'].length ; ++i) {
-      toc += form['to_contacts[]'].options[i].value + ";";
-    }
-    for (var i = 0 ; i < form['cc_contacts[]'].length ; ++i) {
-      ccc += form['cc_contacts[]'].options[i].value + ";";
+    if (form['to_contacts[]'] != undefined) {
+      for (var i = 0 ; i < form['to_contacts[]'].length ; ++i) {
+        toc += form['to_contacts[]'].options[i].value + ";";
+      }
+      for (var i = 0 ; i < form['cc_contacts[]'].length ; ++i) {
+        ccc += form['cc_contacts[]'].options[i].value + ";";
+      }
     }
     $.xpost("emails/send",
            { save: true,

diff --git a/templates/search/quick.tpl b/templates/search/quick.tpl
index a0ee32b..be30a2f 100644 (file)
--- a/templates/search/quick.tpl
+++ b/templates/search/quick.tpl
@@ -32,9 +32,9 @@ mais elle accepte de plus la syntaxe suivante pour les <strong>promotions</stron
 </p>
 <ul>
   <li><code>1990</code>&nbsp;: signifie appartient à la promotion 1990&nbsp;;</li>
-  <li><code>1990-2000</code>&nbsp;: signifie sur la promotion 1990 à 2000&nbsp;;</li>
-  <li><code>&lt;1990</code>&nbsp;: signifie promotions inférieures ou égales à 1990&nbsp;;</li>
-  <li><code>&gt;1990</code>&nbsp;: signifie promotions supérieures ou égales à 1990.</li>
+  <li><code>1990-2000</code>&nbsp;: signifie sur les promotions 1990 à 2000&nbsp;;</li>
+  <li><code>&lt;1990</code>&nbsp;: signifie promotions antérieures ou égales à 1990&nbsp;;</li>
+  <li><code>&gt;1990</code>&nbsp;: signifie promotions postérieures ou égales à 1990.</li>
 </ul>
 <p>
 Ainsi, rechercher tous les "Dupont" sur les promotions 1980 à 1990 et sur la promotion 2000 se fait avec la recherche&nbsp;:

diff --git a/templates/xnetgrp/membres-new-search.tpl b/templates/xnetgrp/membres-new-search.tpl
index e50d646..309d30f 100644 (file)
--- a/templates/xnetgrp/membres-new-search.tpl
+++ b/templates/xnetgrp/membres-new-search.tpl
@@ -27,7 +27,7 @@ Aucun camarade non-inscrit ne correspond aux informations fournies.
 {else}
 Camarades correspondants :
 <select name="userid" onchange="updateSuggestions('{$platal->ns}', this.value)">
-  <option value="0" {if $users|@count neq 1}selected="selected"{/if}>&nbsp;</option>
+  <option value="0" {if $users|@count neq 1}selected="selected"{/if}>Sélectionne le camarade correspondant</option>
   {foreach item=user from=$users}
   <option value="{$user->id()}" {if $users|@count == 1}selected="selected"{/if}>{profile user=$user link=false promo=true}</option>
   {/foreach}