New member class for immaterial entities on Xnet

Can exclude a member class when sending a mail with xnet

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

diff --git a/ChangeLog b/ChangeLog
index 386aff0..be6e97f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@ New:
     * Payment:
         - Directly integrated into Xnet.                                   -FRU
 
+    * Xnet:
+        - New member class for immaterial entities                         -FRU
+
 Bug/Wish:
 
     * Register:

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index abb801f..ad4ac2a 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -279,9 +279,10 @@ class XnetGrpModule extends PLModule
             $body  = Post::v('body');
 
             $mls = array_keys(Env::v('ml', array()));
+            $mbr = array_keys(Env::v('membres', array()));
 
-            require_once 'xnet/mail.inc.php';
-            $tos = get_all_redirects(Post::has('membres'), $mls, $mmlist);
+            require_once dirname(__FILE__) . '/xnetgrp/mail.inc.php';
+            $tos = get_all_redirects($mbr,  $mls, $mmlist);
             send_xnet_mails($from, $sujet, $body, $tos, Post::v('replyto'));
             $page->kill("Mail envoyé !");
             $page->assign('sent', true);
@@ -302,7 +303,7 @@ class XnetGrpModule extends PLModule
         }
         $page->assign('sort', $sort);
 
-        if ($group == 'initiale')
+        if ($group == 'initiale') {
             $res = XDB::iterRow(
                         'SELECT  UPPER(SUBSTRING(
                                     IF(m.origine="X", IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom),
@@ -312,16 +313,17 @@ class XnetGrpModule extends PLModule
                           WHERE  asso_id = {?}
                        GROUP BY  letter
                        ORDER BY  letter', $globals->asso('id'));
-        else
+        } else {
             $res = XDB::iterRow(
-                        'SELECT  IF(m.origine="X",u.promo,"extérieur") AS promo,
+                        'SELECT  IF(m.origine="X",u.promo,
+                                    IF(m.origine="ext", "extérieur", "personne morale")) AS promo,
                                  COUNT(*), IF(m.origine="X",u.promo,"") AS promo_o
                            FROM  groupex.membres AS m
                       LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                           WHERE  asso_id = {?}
                        GROUP BY  promo
                        ORDER BY  promo_o DESC', $globals->asso('id'));
-
+        }
         $alphabet = array();
         $nb_tot = 0;
         while (list($char, $nb) = $res->next()) {
@@ -360,7 +362,7 @@ class XnetGrpModule extends PLModule
                            IF(u.nom_usage<>"", u.nom_usage, u.nom),
                            m.nom) LIKE "'.addslashes(Env::v('initiale')).'%"';
         } elseif (Env::has('promo')) {
-            $ini = 'AND IF(m.origine="X", u.promo, "extérieur") = "'
+            $ini = 'AND IF(m.origine="X", u.promo, IF(m.origine="ext", "extérieur", "personne morale")) = "'
                  .addslashes(Env::v('promo')).'"';
         } elseif (Env::has('admin')) {
             $ini = 'AND m.perms = "admin"';
@@ -369,7 +371,7 @@ class XnetGrpModule extends PLModule
         $ann = XDB::iterator(
                   "SELECT  IF(m.origine='X',IF(u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom,
                            IF(m.origine='X',u.prenom,m.prenom) AS prenom,
-                           IF(m.origine='X',u.promo,'extérieur') AS promo,
+                           IF(m.origine='X', u.promo, IF(m.origine='ext', 'extérieur', 'personne morale')) AS promo,
                            IF(m.origine='X',u.promo,'') AS promo_o,
                            IF(m.origine='X' AND u.perms != 'pending',a.alias,m.email) AS email,
                            IF(m.origine='X',FIND_IN_SET('femme', u.flags), m.sexe) AS femme,
@@ -381,7 +383,7 @@ class XnetGrpModule extends PLModule
                 LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                 LEFT JOIN  aliases         AS a ON ( a.id = m.uid AND a.type='a_vie' )
                     WHERE  m.asso_id = {?} $ini
-                           AND (m.origine = 'ext' OR u.perms != 'pending' OR m.email IS NOT NULL)
+                           AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL)
                  ORDER BY  $tri
                     LIMIT  {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE);
         $page->assign('ann', $ann);
@@ -644,7 +646,7 @@ class XnetGrpModule extends PLModule
                     $uid = Env::i('userid');
                     $res = XDB::query("SELECT *
                                          FROM auth_user_md5
-                                         WHERE user_id = {?} AND perms = 'pending'", $uid);
+                                        WHERE user_id = {?} AND perms = 'pending'", $uid);
                     if ($res->numRows() == 1) {
                         XDB::execute('INSERT INTO groupex.membres (uid, asso_id, origine, email)
                                            VALUES ({?}, {?}, "X", {?})',
@@ -774,17 +776,18 @@ class XnetGrpModule extends PLModule
             $email_changed = ($user['origine'] != 'X' && strtolower($user['email']) != strtolower(Post::v('email')));
             $from_email = $user['email'];
             if ($user['origine'] != 'X') {
+                $user['nom']     = Post::v('nom');
+                $user['prenom']  = (Post::v('origine') == 'ext') ? Post::v('prenom') : '';
+                $user['sexe']    = (Post::v('origine') == 'ext') ? Post::v('sexe') : 0;
+                $user['origine'] = Post::v('origine');
                 XDB::query('UPDATE groupex.membres
-                               SET prenom={?}, nom={?}, email={?}, sexe={?}
+                               SET prenom={?}, nom={?}, email={?}, sexe={?}, origine={?}
                              WHERE uid={?} AND asso_id={?}',
-                           Post::v('prenom'), Post::v('nom'),
-                           Post::v('email'), Post::v('sexe'),
-                           $user['uid'], $globals->asso('id'));
-                $user['nom']    = Post::v('nom');
-                $user['prenom'] = Post::v('prenom');
-                $user['sexe']   = Post::v('sexe');
-                $user['email']  = Post::v('email');
-                $user['email2'] = Post::v('email');
+                           $user['prenom'], $user['nom'], Post::v('email'),
+                           $user['sexe'], $user['origine'], $user['uid'],
+                           $globals->asso('id'));
+                $user['email']   = Post::v('email');
+                $user['email2']  = Post::v('email');
             }
 
             $perms = Post::i('is_admin');
@@ -800,7 +803,7 @@ class XnetGrpModule extends PLModule
             foreach (Env::v('ml1', array()) as $ml => $state) {
                 $ask = empty($_REQUEST['ml2'][$ml]) ? 0 : 2;
                 if ($ask == $state) {
-                    if ($state) {
+                    if ($state && $email_changed) {
                         $mmlist->replace_email($ml, $from_email, $user['email2']);
                         $page->trig("L'abonnement de {$user['prenom']} {$user['nom']} à $ml@ a été mis à jour");
                     }

diff --git a/include/xnet/mail.inc.php b/modules/xnetgrp/mail.inc.php
similarity index 94%
rename from include/xnet/mail.inc.php
rename to modules/xnetgrp/mail.inc.php
index ac7f752..3d55413 100644 (file)
--- a/include/xnet/mail.inc.php
+++ b/modules/xnetgrp/mail.inc.php
@@ -21,13 +21,15 @@
 
 // {{{ get_all_redirects
 
-function get_all_redirects($membres, $mls, &$client)
+function get_all_redirects($membres, $exclude, $mls, &$client)
 {
     global $globals;
     
     $tos = array();
     
-    if ($membres) {
+    if (!empty($membres)) {
+        $membres = array_map(create_function('$str', 'return "\"$str\"";'), $membres);
+        $membres = join(',', $membres);
         $res = XDB::query(
                     'SELECT  IF(u.nom <> "", u.nom, m.nom) AS nom,
                              IF(u.prenom <> "", u.prenom, m.prenom) AS prenom,
@@ -37,6 +39,7 @@ function get_all_redirects($membres, $mls, &$client)
                   LEFT JOIN  auth_user_md5   AS u ON (m.uid=u.user_id AND m.uid<50000)
                   LEFT JOIN  aliases         AS a ON (a.id=u.user_id and a.type="a_vie")
                       WHERE  asso_id = {?}
+                             AND m.origine IN (' . $membres . ')
                              AND (m.email <> "" OR u.perms <> "pending")', $globals->asso('id'));
         $tos = $res->fetchAllAssoc();
     }
@@ -90,7 +93,7 @@ function _send_xnet_mail($user, $body, $mailer, $replyto = null)
         $mailer->addHeader('Reply-To', $replyto);
     }
     $mailer->setTxtBody(wordwrap($text, 72));
-    $mailer->send();
+//    $mailer->send();
 }
 
 // }}}

diff --git a/templates/xnet/groupe/mail.tpl b/templates/xnet/groupe/mail.tpl
index 1779ccc..3c87b79 100644 (file)
--- a/templates/xnet/groupe/mail.tpl
+++ b/templates/xnet/groupe/mail.tpl
@@ -56,8 +56,13 @@ masculin ou f
         <em>annuaire</em>
       </td>
       <td>
-        <input type="checkbox" name="membres" value="1" {if $smarty.request.membres}checked="checked"{/if} />
-        <em>écrit à tout l'annuaire du groupe</em> <a href="{$platal->ns}annuaire" class='popup'>(voir annuaire)</a>
+        <input type="checkbox" name="membres[X]" value="1"  {if $smarty.request.membres.X}checked="checked"{/if} />
+        <em>écrire à tous les X de l'annuaire du groupe</em><br />
+        <input type="checkbox" name="membres[ext]" value="1"  {if $smarty.request.membres.ext}checked="checked"{/if} />
+        <em>écrire à tous les extérieurs de l'annuaire du groupe</em><br />
+        <input type="checkbox" name="membres[groupe]" value="1"  {if $smarty.request.membres.groupe}checked="checked"{/if} />
+        <em>écrire à toutes les personnes morales de l'annuaire du groupe</em>
+        <a href="{$platal->ns}annuaire" class='popup'>(voir annuaire)</a><br />
       </td>
     </tr>
 

diff --git a/templates/xnet/groupe/membres-edit.tpl b/templates/xnet/groupe/membres-edit.tpl
index b30780a..9a0202d 100644 (file)
--- a/templates/xnet/groupe/membres-edit.tpl
+++ b/templates/xnet/groupe/membres-edit.tpl
@@ -20,6 +20,17 @@
 {*                                                                        *}
 {**************************************************************************}
 
+<script type="text/javascript">
+  {literal}
+    function showInformations(box)
+    {
+        var state = (box.value == 'ext') ? '' : 'none';
+        document.getElementById('prenom').style.display = state;
+        document.getElementById('sexe').style.display = state;
+    }
+  {/literal}
+</script>
+
 <h1>{$asso.nom} : gestion des membres</h1>
 
 <p>
@@ -52,7 +63,18 @@
     {if $user.origine neq X}
     <tr class="impair">
       <td class="titre">
-        Prénom:
+        Type d'utilisateur :
+      </td>
+      <td>
+        <select name="origine" onchange="showInformations(this); return true">
+          <option value="ext" {if $user.origine eq "ext"}selected="selected"{/if}>Personne physique</option>
+          <option value="groupe" {if $user.origine eq "groupe"}selected="selected"{/if}>Personne morale</option>
+        </select>
+      </td>
+    </tr>
+    <tr id="prenom" class="impair" {if $user.origine eq "groupe"}style="display: none"{/if}>
+      <td class="titre">
+        Prénom :
       </td>
       <td>
         <input type="text" value="{$user.prenom}" name="prenom" size="40" />
@@ -60,15 +82,15 @@
     </tr>
     <tr class="impair">
       <td class="titre">
-        Nom:
+        Nom :
       </td>
       <td>
         <input type="text" value="{$user.nom}" name="nom" size="40" />
       </td>
     </tr>
-    <tr class="impair">
+    <tr id="sexe" class="impair" {if $user.origine eq "groupe"}style="display: none"{/if}>
       <td class="titre">
-        Sexe:
+        Sexe :
       </td>
       <td>
         <select name="sexe">

diff --git a/upgrade/0.9.13/02_xnet.sql b/upgrade/0.9.13/02_xnet.sql
new file mode 100644 (file)
index 0000000..afff7ed
--- /dev/null
+++ b/upgrade/0.9.13/02_xnet.sql
@@ -0,0 +1,4 @@
+use groupex;
+alter table membres change origine origine enum('X', 'ext', 'groupe') not null default 'X';
+use x4dat;
+# vim:set syntax=mysql: