From 69e61fa0961f4249b9e776f0fb0cd403bf845000 Mon Sep 17 00:00:00 2001
From: Steven Mondji-Lerider <squidly@nnx.com>
Date: Fri, 25 May 2012 13:08:44 +0000
Subject: [PATCH] Correction classe de gestion des htaccess

---
 bureau/admin/hta_doedituser.php |  2 +-
 bureau/admin/hta_list.php       |  2 +-
 bureau/class/m_hta.php          | 39 +++++++++++++++++----------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/bureau/admin/hta_doedituser.php b/bureau/admin/hta_doedituser.php
index 2e6351d5..5e443a1b 100644
--- a/bureau/admin/hta_doedituser.php
+++ b/bureau/admin/hta_doedituser.php
@@ -52,7 +52,7 @@ if (!$hta->change_pass($user,$newpass,$dir)) {
 <hr id="topbar"/>
 <br />
 <?php
-	if ($error) {
+	if (isset($error) && $error) {
 		echo "<p class=\"error\">$error</p>";
 	}
 	else {
diff --git a/bureau/admin/hta_list.php b/bureau/admin/hta_list.php
index 73d10b51..bf503e6b 100644
--- a/bureau/admin/hta_list.php
+++ b/bureau/admin/hta_list.php
@@ -42,7 +42,7 @@ else {
 <hr id="topbar"/>
 <br />
 <?php
-	if ($error) {
+	if (isset($error) && $error) {
 		echo "<p class=\"error\">$error</p>";
 	}
 
diff --git a/bureau/class/m_hta.php b/bureau/class/m_hta.php
index d2bcf396..9e20d57d 100644
--- a/bureau/class/m_hta.php
+++ b/bureau/class/m_hta.php
@@ -104,23 +104,24 @@ class m_hta {
    * Returns the list of all user folder currently protected by a .htpasswd file
    * @return array Array containing user folder list
    */
-  function ListDir() {
-    global $err,$mem,$L_ALTERNC_LOC;
-    $err->log("hta","listdir");
-    $sortie=array();
-    $absolute="$L_ALTERNC_LOC/html/".substr($mem->user["login"],0,1)."/".$mem->user["login"];
-    exec("find $absolute -name .htpasswd | sort", $sortie);
-    if (!count($sortie)) {
-      $err->raise("hta",4);
-      return false;
-    }
-    for ($i=0;$i<count($sortie);$i++){
-      preg_match("/^".addslashes("$L_ALTERNC_LOC/html/")."\/.\/[^\/]*\/(.*)\/\.htpasswd/", $sortie[$i], $matches);
-      $r[$i]=$matches[1]."/";
-    }
-    return $r;
-  }
 
+  function ListDir(){
+	  global$err,$mem,$L_ALTERNC_LOC;
+	  $err->log("hta","listdir");
+	  $sortie=array();
+	  $absolute="$L_ALTERNC_LOC/html/".substr($mem->user["login"],0,1)."/".$mem->user["login"];
+	  exec("find $absolute -name .htpasswd|sort",$sortie);
+	  if(!count($sortie)){
+		  $err->raise("hta",4);
+		  return false;
+	  }
+	  $pattern="/^".preg_quote($L_ALTERNC_LOC,"/")."\/html\/.\/[^\/]*\/(.*)\/\.htpasswd/";
+	  	  for($i=0;$i<count($sortie);$i++){
+		  preg_match($pattern,$sortie[$i],$matches);
+		  $r[$i]=$matches[1]."/";
+	  }
+	  return $r;
+  }
 
   /*---------------------------------------------------------------------------*/
   /**
@@ -191,11 +192,11 @@ class m_hta {
       $err->raise("hta",8,$dir);
       return false;
     }
-    if (!unlink("$dir/.htaccess")) {
+    if (!@unlink("$dir/.htaccess")) {
       $err->raise("hta",5,$dir);
       return false;
     }
-    if (!unlink("$dir/.htpasswd")) {
+    if (!@unlink("$dir/.htpasswd")) {
       $err->raise("hta",6,$dir);
       return false;
     }
@@ -314,7 +315,7 @@ class m_hta {
 
     // Check this password against the password policy using common API : 
     if (is_callable(array($admin,"checkPolicy"))) {
-      if (!$admin->checkPolicy("hta",$user,$password)) {
+      if (!$admin->checkPolicy("hta",$user,$newpass)) {
 	return false; // The error has been raised by checkPolicy()
       }
     }