Merge branch 'xorg/maint' into xorg/master

diff --cc modules/auth.php
index 635c8f1,a86313e..688c5c5
--- 1/modules/auth.php
--- 2/modules/auth.php
+++ b/modules/auth.php
@@@ -30,9 -30,9 +30,9 @@@ class AuthModule extends PLModul
              'webservices/manageurs.php'     => $this->make_hook('manageurs',          AUTH_PUBLIC, 'user', NO_HTTPS),
  
              'auth-redirect.php'             => $this->make_hook('redirect',           AUTH_COOKIE, 'user'),
-             'auth-groupex.php'              => $this->make_hook('groupex_old',        AUTH_COOKIE, 'user'),
-             'auth-groupex'                  => $this->make_hook('groupex',            AUTH_PUBLIC),
+             'auth-groupex.php'              => $this->make_hook('groupex_old',        AUTH_COOKIE, ''),
+             'auth-groupex'                  => $this->make_hook('groupex',            AUTH_PUBLIC, ''),
 -            'admin/auth-groupes-x'          => $this->make_hook('admin_authgroupesx', AUTH_MDP,    'admin'),
 +            'admin/auth-groupes-x'          => $this->make_hook('admin_authgroupesx', AUTH_PASSWD, 'admin'),
          );
      }
  

diff --cc modules/xnetgrp.php
Simple merge

diff --cc templates/xnet/account.mail.tpl
Simple merge