Changeset 3151

Timestamp:

05/25/12 15:08:44 (13 months ago)

Author:

squidly

Message:

Correction classe de gestion des htaccess

Location:

alternc/trunk/bureau

Files:

• admin/hta_doedituser.php (modified) (1 diff)
• admin/hta_list.php (modified) (1 diff)
• class/m_hta.php (modified) (3 diffs)

alternc/trunk/bureau/admin/hta_doedituser.php

@@ -53 +53 @@
 <br />
 <?php
-        if ($error) {
+        if (isset($error) && $error) {
                 echo "<p class=\"error\">$error</p>";
         }

alternc/trunk/bureau/admin/hta_list.php

@@ -43 +43 @@
 <br />
 <?php
-        if ($error) {
+        if (isset($error) && $error) {
                 echo "<p class=\"error\">$error</p>";
         }

alternc/trunk/bureau/class/m_hta.php

@@ -105 +105 @@
    * @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;
+  }
 
   /*---------------------------------------------------------------------------*/
@@ -192 +193 @@
       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;
@@ -315 +316 @@
     // 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()
       }