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:
Remi 2016-02-25 14:17:43 +01:00
parent 6cb248aec5 72c0247809
commit 7eb64f08a5
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bureau/class/m_bro.php
View File

@ -659,23 +659,28 @@ class m_bro {
return 1; return 1;
} }
$lfile = strtolower($file); $lfile = strtolower($file);
if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z") { if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z" || substr($lfile, -4) == ".tgz" || substr($lfile, -4) == ".tbz" || substr($lfile, -5) == ".tbz2" ) {
// TODO new version of tar supports `tar xf ...` so there is no // TODO new version of tar supports `tar xf ...` so there is no
// need to specify the compression format // need to specify the compression format
echo "<p>" . _("Uncompressing through TAR") . "</p><pre style=\"overflow: scroll; height: 200px\">"; echo "<p>" . _("Uncompressing through TAR") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$ret = 0; $ret = 0;
passthru("tar -xvf " . escapeshellarg($file) . " -C " . escapeshellarg($dest) . " 2>&1", $ret); passthru("tar -xvf " . escapeshellarg($file) . " --numeric-owner -C " . escapeshellarg($dest) . " 2>&1", $ret);
} }
if (substr($lfile, -4) == ".zip") { elseif (substr($lfile, -4) == ".zip") {
echo "<p>" . _("Uncompressing through UNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">"; echo "<p>" . _("Uncompressing through UNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1"; $cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1";
passthru($cmd, $ret); passthru($cmd, $ret);
} }
if (substr($lfile, -3) == ".gz" && substr($lfile, -7) != ".tar.gz") { elseif (substr($lfile, -3) == ".gz" || substr($lfile, -2) == ".Z") {
echo "<p>" . _("Uncompressing through GUNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">"; echo "<p>" . _("Uncompressing through GUNZIP") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$cmd = "gunzip " . escapeshellarg($file) . " 2>&1"; $cmd = "gunzip " . escapeshellarg($file) . " 2>&1";
passthru($cmd, $ret); passthru($cmd, $ret);
} }
elseif (substr($lfile, -3) == ".bz" || substr($lfile, -4) == ".bz2") {
echo "<p>" . _("Uncompressing through bunzip2") . "</p><pre style=\"overflow: scroll; height: 200px\">";
$cmd = "bunzip2 " . escapeshellarg($file) . " 2>&1";
passthru($cmd, $ret);
}
echo "</pre>"; echo "</pre>";
if ($ret) { if ($ret) {
$err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file); $err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file);

8
bureau/class/m_dom.php
View File

@ -987,6 +987,14 @@ class m_dom {
} }
} }
break; break;
case "co":
if (preg_match("#Name Server:#", $ligne)) {
$found = true;
$tmp = strtolower(str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", str_replace("Name Server:", "", $ligne)))));
if ($tmp)
$serveurList[] = $tmp;
}
break;
case "cx": case "cx":
$ligne = str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", $ligne))); $ligne = str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", $ligne)));
if ($ligne == "" && $state == 1) { if ($ligne == "" && $state == 1) {

16
etc/alternc/templates/alternc/postfix/postfix.cf
View File

@ -55,3 +55,19 @@ message_size_limit = 100000000
virtual_mailbox_limit = 0 virtual_mailbox_limit = 0
mailbox_size_limit = 0 mailbox_size_limit = 0
enable_original_recipient = no enable_original_recipient = no
smtp_tls_dcert_file = $smtpd_tls_dcert_file
smtp_tls_dkey_file = $smtpd_tls_dcert_file
smtp_tls_CAfile = $smtpd_tls_CAfile
smtp_tls_key_file = $smtpd_tls_dcert_file
smtp_tls_cert_file = $smtpd_tls_dcert_file
smtp_use_tls = yes
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
smtpd_tls_protocols = TLSv1, TLSv1.1, TLSv1.2
smtp_tls_protocols = TLSv1, TLSv1.1, TLSv1.2
smtpd_tls_exclude_ciphers = aNULL, DES, 3DES, MD5, DES+MD5, RC4
smtp_tls_exclude_ciphers = aNULL, DES, 3DES, MD5, DES+MD5, RC4
tls_preempt_cipherlist = yes
smtpd_tls_mandatory_ciphers = high
smtp_tls_mandatory_ciphers = high
smtpd_tls_ciphers = high
smtp_tls_ciphers = high

3
install/upgrades/3.4.4.sql Normal file
View File

@ -0,0 +1,3 @@
INSERT IGNORE INTO tld VALUES ('co', 1);
INSERT IGNORE INTO tld VALUES ('cc', 1);