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

Merge branch 'stable-3.1' into feature-message

This commit is contained in:
Benjamin Sonntag 2017-09-06 18:44:38 +02:00
parent 65f994f763 39947d4f1c
commit 25379ec441
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bureau/class/m_dom.php
View File

@ -1344,7 +1344,7 @@ class m_dom {
$compatibility_lst = explode(",", $db->f('compatibility')); $compatibility_lst = explode(",", $db->f('compatibility'));
// Get the list of type of subdomains already here who have the same name // Get the list of type of subdomains already here who have the same name
$db->query("select * from sub_domaines where sub= ? and domaine= ? and not id = ? and web_action != 'DELETE' and enabled not in ('DISABLED', 'DISABLE') ", array($sub, $dom, $sub_domain_id)); $db->query("select * from sub_domaines where sub= ? and domaine= ? and not id = ? and web_action != 'DELETE' and enable not in ('DISABLED', 'DISABLE') ", array($sub, $dom, $sub_domain_id));
#$db->query("select * from sub_domaines where sub='$sub' and domaine='$dom';"); #$db->query("select * from sub_domaines where sub='$sub' and domaine='$dom';");
while ($db->next_record()) { while ($db->next_record()) {
// And if there is a domain with a incompatible type, return false // And if there is a domain with a incompatible type, return false

2
debian/changelog vendored
View File

@ -12,6 +12,8 @@ alternc (3.1.11) oldoldstable; urgency=low
* enh adding X-Forwarded-Proto detection for SSL, not only HTTP_SSL from Apache * enh adding X-Forwarded-Proto detection for SSL, not only HTTP_SSL from Apache
* enh add a variable to enable IP check in the panel (broken), disabled by default * enh add a variable to enable IP check in the panel (broken), disabled by default
* fix opendkim signing for mails submitted over the network * fix opendkim signing for mails submitted over the network
* fix a LOT of bugs from Github: #128 #69 #116 #123 #126 #134 #139 #156 #173 #138
* fix more BUGS from Github: #178 #159 #155 #176 #161 #162 #164 #165 #166 #170 #175 #177
-- Benjamin Sonntag <benjamin@sonntag.fr> Wed, 7 Jun 2017 10:36:00 +0300 -- Benjamin Sonntag <benjamin@sonntag.fr> Wed, 7 Jun 2017 10:36:00 +0300

2
ssl/alternc-ssl.install.php
View File

@ -38,7 +38,7 @@ if ($argv[1] == "before-reload") {
$db->query("SELECT * FROM domaines_type WHERE name='roundcube';"); $db->query("SELECT * FROM domaines_type WHERE name='roundcube';");
if ($db->next_record()) { if ($db->next_record()) {
$db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
('roundcube-ssl', 'HTTPS Roundcube Webmail', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'mx,mx2,defmx,defmx2,txt', 'ALL', 0, 0, 1;"); ('roundcube-ssl', 'HTTPS Roundcube Webmail', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'mx,mx2,defmx,defmx2,txt', 'ALL', 0, 0, 1);");
} else { } else {
$db->query("DELETE FROM domaines_type WHERE name='roundcube-ssl';"); $db->query("DELETE FROM domaines_type WHERE name='roundcube-ssl';");
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='roundcube-ssl';"); $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='roundcube-ssl';");