backport

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

diff --git a/include/lists.inc.php b/include/lists.inc.php
index 9338cb7..a68d207 100644 (file)
--- a/include/lists.inc.php
+++ b/include/lists.inc.php
@@ -30,7 +30,7 @@ function &lists_xmlrpc($uid, $pass, $fqdn=null)
 {
     global $globals;
 
-    $dom = empty($fqdn) ? $globals->mail->domain : $fqdn;
+    $dom = is_null($fqdn) ? $globals->mail->domain : $fqdn;
     $url = "http://$uid:$pass@{$globals->lists->rpchost}:{$globals->lists->rpcport}/$dom";
     $client = new xmlrpc_client($url);
     return $client;

diff --git a/templates/xnet/login.tpl b/templates/xnet/login.tpl
index d4e5343..24472ca 100644 (file)
--- a/templates/xnet/login.tpl
+++ b/templates/xnet/login.tpl
@@ -59,7 +59,7 @@
       </div>
     </td>
     <td style="padding: 1em">
-      <form action="{$smarty.server.REQUEST_URI}" method="post" id="login" onsubmit="doChallengeResponse(); return false;">
+      <!--<form action="{$smarty.server.REQUEST_URI}" method="post" id="login" onsubmit="doChallengeResponse(); return false;">
         <table class="large" cellpadding="4" cellspacing="0" summary="Formulaire de login">
           <tr>
             <th colspan="2">Connexion
@@ -91,7 +91,8 @@
         </table>
       </form>
 
-      (Activer obligatoirement le <strong>javascript</strong>)
+      (Activer obligatoirement le <strong>javascript</strong>) -->
+      <p>(Non disponible)</p>
       {if $smarty.request.response}<!-- failed login code //-->
       <div class="erreur">
         Erreur d'identification. Essaie à nouveau !

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 22ded4d..0f9619a 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -140,7 +140,7 @@
           {only_public}
           <div>Me connecter :</div>
           <a class='gp' href="{$smarty.session.session->loginX}">polytechnicien</a>
-          <a class='gp' href="{rel}/login.php">extérieur</a>
+          <!--a class='gp' href="{rel}/login.php">extérieur</a-->
           {/only_public}
         </td>
         <td id="search">