Merge branch 'xorg/master' into xorg/f/xnet-accounts

diff --cc classes/user.php
Simple merge

diff --cc classes/xnetpage.php
Simple merge

diff --cc configs/mails.conf
Simple merge

diff --cc modules/xnet.php
Simple merge

diff --cc modules/xnetgrp.php
index 8a04125,05319f0..9206635
--- 1/modules/xnetgrp.php
--- 2/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@@ -1050,11 -1009,9 +1057,11 @@@ class XnetGrpModule extends PLModul
          $res = XDB::rawFetchAllAssoc('SHOW COLUMNS FROM group_members LIKE \'position\'');
          $positions = str_replace(array('enum(', ')', '\''), '', $res[0]['Type']);
  
 +        $page->addJsLink('password.js');
 +        $page->assign('onlyGroup', ($user->groupCount() == 1));
          $page->assign('user', $user);
          $page->assign('listes', $mmlist->get_lists($user->forlifeEmail()));
-         $page->assign('alias', $user->emailAliases($globals->asso('mail_domain'), 'user', true));
+         $page->assign('alias', $user->emailGroupAliases($globals->asso('mail_domain')));
          $page->assign('positions', explode(',', $positions));
      }
  

diff --cc modules/xnetnl.php
index 118b99c,a5a25ed..b22c687
--- 1/htdocs/javascript/password.js
--- 2/modules/xnetnl.php
+++ b/modules/xnetnl.php
@@@ -18,34 -19,30 +19,43 @@@
   *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
   ***************************************************************************/
  
- function hashResponse(password1, password2, hasConfirmation) {
-     pw1 = $('[name=' + password1 + ']').val();
+ Platal::load('newsletter');
  
++<<<<<<< HEAD:htdocs/javascript/password.js
 +    if (pw1 == '********') {
 +        return true;
 +    }
 +    if (hasConfirmation) {
 +        pw2 = $('[name=' + password2 + ']').val();
 +        if (pw1 != pw2) {
 +            alert("\nErreur : les deux champs ne sont pas identiques !");
 +            return false;
 +        }
 +        $('[name=' + password2 + ']').val('');
++=======
+ class XnetNlModule extends NewsletterModule
+ {
+     function handlers()
+     {
+         return array(
+             '%grp/nl'                   => $this->make_hook('nl',                    AUTH_MDP),
+             '%grp/nl/show'              => $this->make_hook('nl_show',               AUTH_MDP),
+             '%grp/nl/search'            => $this->make_hook('nl_search',             AUTH_MDP),
+             '%grp/admin/nl'             => $this->make_hook('admin_nl',              AUTH_MDP,    'groupadmin'),
+             '%grp/admin/nl/edit'        => $this->make_hook('admin_nl_edit',         AUTH_MDP,    'groupadmin'),
+             '%grp/admin/nl/edit/cancel' => $this->make_hook('admin_nl_cancel',       AUTH_MDP,    'groupadmin'),
+             '%grp/admin/nl/edit/valid'  => $this->make_hook('admin_nl_valid',        AUTH_MDP,    'groupadmin'),
+             '%grp/admin/nl/categories'  => $this->make_hook('admin_nl_cat',          AUTH_MDP,    'groupadmin'),
+         );
++>>>>>>> xorg/master:modules/xnetnl.php
      }
  
-     if (pw1.length < 6) {
-         alert("\nErreur : le nouveau mot de passe doit faire au moins 6 caractères !");
-         return false;
+     protected function getNl()
+     {
+        global $globals;
+        $group = $globals->asso('shortname');
+        return NewsLetter::forGroup($group);
      }
-     if (!differentTypes(pw1)) {
-         alert ("\nErreur : le nouveau mot de passe doit comporter au moins deux types de caractères parmi les suivants : lettres minuscules, lettres majuscules, chiffres, caractères spéciaux.");
-         return false;
-     }
- 
-     alert("Le mot de passe que tu as rentré va être chiffré avant de nous parvenir par Internet ! Ainsi il ne circulera pas en clair.");
-     $('[name=' + password1 + ']').val('');
-     $('[name=pwhash]').val(hash_encrypt(pw1));
-     return true;
  }
  
  // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:

diff --cc templates/xnet/skin.tpl
Simple merge

diff --cc templates/xnetgrp/membres-edit.tpl
Simple merge