kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'stable-3.1' of github.com:AlternC/AlternC into stable-3.1

This commit is contained in:
Benjamin Sonntag 2017-10-08 10:58:10 +02:00
parent 5e697346a2 13c761f082
commit 945d9c14f8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/alternc.install
View File

@ -627,7 +627,7 @@ done
# Fix some perms # Fix some perms
# Fix phpmyadmin import trac#1557 # Fix phpmyadmin import trac#1557
test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true
test -d "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true
# hook # hook
run-parts --arg=end /usr/lib/alternc/install.d run-parts --arg=end /usr/lib/alternc/install.d

2
jessie/alternc.install
View File

@ -636,7 +636,7 @@ done
# Fix some perms # Fix some perms
# Fix phpmyadmin import trac#1557 # Fix phpmyadmin import trac#1557
test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true
test -d "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true
# hook # hook
run-parts --arg=end /usr/lib/alternc/install.d run-parts --arg=end /usr/lib/alternc/install.d

8
src/spoolsize.php
View File

@ -22,7 +22,7 @@ if ($db->query("SELECT uid,login FROM membres;")) {
} else { } else {
// The QUOTA system being disabled, we need to use 'du' on each folder. // The QUOTA system being disabled, we need to use 'du' on each folder.
$login = $db->f('login'); $login = $db->f('login');
$size=exec("/usr/bin/du /var/www/alternc/".substr($login,0,1)."/".$login); $size=exec("/usr/bin/du -s /var/www/alternc/".substr($login,0,1)."/".$login);
} }
$db2->query("REPLACE INTO size_web SET uid=?, size=?;",array(intval($db->f('uid')),intval($size))); $db2->query("REPLACE INTO size_web SET uid=?, size=?;",array(intval($db->f('uid')),intval($size)));
echo $db->f('login')." (".(round($size/1024, 1))." MB)\n"; echo $db->f('login')." (".(round($size/1024, 1))." MB)\n";
@ -58,9 +58,9 @@ if ($db->query("SELECT uid, name FROM mailman;")) {
} }
foreach ($cc as $c){ foreach ($cc as $c){
echo $c["uid"]."/".$c["name"]; flush(); echo $c["uid"]."/".$c["name"]; flush();
$size1=exec("sudo /usr/bin/du ".escapeshellarg("/var/lib/mailman/lists/".$c["name"])); $size1=exec("sudo /usr/bin/du -s ".escapeshellarg("/var/lib/mailman/lists/".$c["name"]));
$size2=exec("sudo /usr/bin/du ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"])); $size2=exec("sudo /usr/bin/du -s ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"]));
$size3=exec("sudo /usr/bin/du ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"].".mbox")); $size3=exec("sudo /usr/bin/du -s ".escapeshellarg("/var/lib/mailman/archives/private/".$c["name"].".mbox"));
$size=(intval($size1)+intval($size2)+intval($size3)); $size=(intval($size1)+intval($size2)+intval($size3));
$db->query("REPLACE INTO size_mailman SET uid=?,list=?,size=?;",array($c["uid"],$c["name"],$size)); $db->query("REPLACE INTO size_mailman SET uid=?,list=?,size=?;",array($c["uid"],$c["name"],$size));
echo " done (".(round($size/1024, 1))." MB) \n"; flush(); echo " done (".(round($size/1024, 1))." MB) \n"; flush();