From 799876ea023b44f68b7bd07b468cd7726146cfdf Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Tue, 4 Dec 2012 11:06:26 +0000
Subject: [PATCH] =?UTF-8?q?M=C3=A0j=20de=20certaines=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/class/m_dom.php | 2 +-
 bureau/class/m_mem.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index aed0ed31..f8e23e26 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -1138,7 +1138,7 @@ class m_dom {
    */
   function add_slave_ip($ip,$class="32") {
   global $db,$err;
-  if (!checkip($ip)) { // FIXME: replace by filter_var (same for checkfqdn ?
+  if (!checkip($ip)) { 
     $err->raise("dom",_("The IP address you entered is incorrect"));
     return false;
   }
diff --git a/bureau/class/m_mem.php b/bureau/class/m_mem.php
index 8857cc5b..8aa542c7 100644
--- a/bureau/class/m_mem.php
+++ b/bureau/class/m_mem.php
@@ -462,7 +462,7 @@ Quelqu'un (peut-etre vous) a demand
 Afin de confirmer que cet email est valide, merci de vous rendre à l'adresse
 ci-dessous :
 
-https://$L_FQDN/admin/mem_cm.php?usr=$cuid&cookie=$COOKIE
+https://$L_FQDN/mem_cm.php?usr=$cuid&cookie=$COOKIE
 
 (attention : si cette adresse est coupée sur 2 lignes, ne pas oublier de
 reconstituer sur une seule ligne). Le bureau vous demandera la clé qui vous
@@ -542,7 +542,7 @@ Cordialement.
       if ($hlp!="hlp_$file") {
 	      $hlp=preg_replace(
 			  "#HELPID_([0-9]*)#",
-			  "<a href=\"javascript:help(\\1);\"><img src=\"/admin/aide/help.png\" width=\"17\" height=\"17\" style=\"vertical-align: middle;\" alt=\""._("Help")."\" /></a>",$hlp);
+			  "<a href=\"javascript:help(\\1);\"><img src=\"/aide/help.png\" width=\"17\" height=\"17\" style=\"vertical-align: middle;\" alt=\""._("Help")."\" /></a>",$hlp);
       	echo "<p class=\"hlp\">".$hlp."</p>";
        	return true;
       }