Changeset 3183

Timestamp:

06/19/12 17:29:15 (11 months ago)

Author:

squidly

Message:

Modification script gestion ACLS + classe browser

Location:

alternc/trunk

Files:

• bureau/class/m_bro.php (modified) (5 diffs)
• src/fixperms.sh (modified) (2 diffs)

alternc/trunk/bureau/class/m_bro.php

@@ -472 +472 @@
    * @return boolean TRUE si les fichiers ont t renomms, FALSE si une erreur s'est produite.
    */
-  function ChangePermissions($R,$d,$perm,$verbose=true) {
+  function ChangePermissions($R,$d,$perm,$verbose=false) {
     global $err;
     $absolute=$this->convertabsolute($R,0);
@@ -545 +545 @@
   function ExtractFile($file, $dest=null)
   {
-    global $err;
+    global $err,$cuid,$mem,$L_ALTERNC_LOC;
     $file = $this->convertabsolute($file,0);
     if (is_null($dest)) {
@@ -557 +557 @@
     }
     $file = escapeshellarg($file);
-    $dest = escapeshellarg($dest);
+        $dest = escapeshellarg($dest);
+        $dest_to_fix=str_replace($L_ALTERNC_LOC."/html/".substr($mem->user["login"],0,1)."/".$mem->user["login"],'',$dest);
+         
     // TODO new version of tar supports `tar xf ...` so there is no
     //     need to specify the compression format
@@ -575 +577 @@
       $err->raise("bro","could not find a way to extract file %s, unsupported format?", $file);
     }
-
+        
+        //fix the perms of the extracted archive
+        exec("sudo /usr/lib/alternc/fixperms.sh -u ".$cuid." -d ".$dest_to_fix);
     return $ret;
   }
@@ -713 +717 @@
     $dir=str_replace("%2F", "/", urlencode($dir));
     $name=urlencode($name);
-    if (!$this->cacheurl["d".$dir]) {
+    if (!@$this->cacheurl["d".$dir]) {
       // On parcours $dir en remontant les /
       $end="";  $beg=$dir;      $tofind=true;

alternc/trunk/src/fixperms.sh

@@ -107 +107 @@
 
       # Set the file readable only for the AlternC User
-      chown -R $GID:$GID "$REP"
+      chown -R alterncpanel:$GID "$REP"
       chmod 2770 -R "$REP"
 
       # Delete existings ACL
       # Set the defaults acl on all the files
-      setfacl -b -k -m d:g:alterncpanel:rwx -m d:u:$GID:rw- -m d:g:$GID:rw- \
-                    -Rm   g:alterncpanel:rwx -m   u:$GID:rw- -m   g:$GID:rw- \
+      setfacl -b -k -n -R -m d:g:alterncpanel:rwx -m d:u::rwx -m d:g::rwx -m d:u:$GID:rwx -m d:g:$GID:rwx -m d:o::--- -m d:mask:rwx\
+                    -Rm   g:alterncpanel:rwx -m u:$GID:rwx -m g:$GID:rwx -m mask:rwx\
                "$REP"
 
@@ -125 +125 @@
         echo "gid: $GID"
         echo "file: $file"
-        chown $GID:$GID $file
+        chown alterncpanel:$GID $file
         chmod 0770 $file
         /usr/bin/setfacl  -m u:$GID:rw- -m g:$GID:rw- -m g:alterncpanel:rw- -m u:$GID:rw- -m g:$GID:rw- $file