Changeset 3187

Timestamp:

06/26/12 10:08:49 (11 months ago)

Author:

squidly

Message:

Bugfixes gestions des droits

Location:

alternc/trunk

Files:

• bureau/class/m_dom.php (modified) (1 diff)
• bureau/class/m_quota.php (modified) (1 diff)
• install/mysql.sh (modified) (2 diffs)
• src/mem_add (modified) (1 diff)

alternc/trunk/bureau/class/m_dom.php

@@ -419 +419 @@
                   }
       }
-
-          //on corrige les permissions
-          exec("sudo /usr/lib/alternc/fixperms.sh -u ".$cuid);
 
       // Creation des 3 sous-domaines par défaut : Vide, www et mail

alternc/trunk/bureau/class/m_quota.php

@@ -181 +181 @@
     if (isset($this->disk[$ressource])) {
       // It's a disk resource, update it with shell command
-      exec("/usr/lib/alternc/quota_edit $cuid $size");
+      exec("/usr/lib/alternc/quota_edit $cuid $size &> /dev/null &");
       // Now we check that the value has been written properly : 
-      exec("usr/lib/alternc/quota_get $cuid",$a);
+      exec("/usr/lib/alternc/quota_get $cuid &> /dev/null &",$a);
     if ($size!=$a[1]) {
         $err->raise("quota",1);

alternc/trunk/install/mysql.sh

@@ -165 +165 @@
 set_value password $alternc_mail_password $MYSQL_MAIL_CONFIG
 
-echo $SED_SCRIPT_MAIL
-echo XXXXXX
-echo $SED_SCRIPT_USR
 
 # take extra precautions here with the mysql password:
@@ -193 +190 @@
 echo "Checking for MySQL connectivity"
 $mysql -e "SHOW TABLES" >/dev/null && echo "MYSQL.SH OK!" || echo "MYSQL.SH FAILED: database user setup failed"
-echo $grant_mail
 # Final mysql setup: db schema
 echo "installing AlternC schema in $database..."
 $mysql < /usr/share/alternc/install/mysql.sql || echo cannot load database schema
 $mysql <<EOF
- $grant_mail
+$grant_mail
 EOF

alternc/trunk/src/mem_add

@@ -34 +34 @@
     chown($uid, $uid, $p);
     system("/bin/chmod 02770 '$p'");
-    system("/usr/bin/setfacl -m d:g:alterncpanel:rw- -m d:u:$uid:rw- -m d:g:$uid:rw- -m g:alterncpanel:rw- -m u:$uid:rw- -m g:$uid:rw- '$p'");
+    system("/usr/lib/alternc/fixperms.sh -u '$uid' ");
 }