From 8a4a057376d8371aa976f3f37b178cd738c4eb59 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 21 Feb 2016 12:27:11 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/lib/classes/remote.d/aps.inc.php | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/remote.d/aps.inc.php b/interface/lib/classes/remote.d/aps.inc.php
index 6497da4..4db5f78 100644
--- a/interface/lib/classes/remote.d/aps.inc.php
+++ b/interface/lib/classes/remote.d/aps.inc.php
@@ -273,8 +273,15 @@
return false;
}
- $sql = "SELECT * FROM web_domain WHERE domain = ?";
- $domain = $app->db->queryOneRecord($sql, $params['main_domain']);
+ if (substr($params['main_domain'], 0, 4) == 'www.') {
+ $domain = substr($params['main_domain'], 4);
+ $sql = "SELECT * FROM web_domain WHERE domain = ? AND subdomain=?";
+ $domain = $app->db->queryOneRecord($sql, $domain, 'www');
+ }
+ else {
+ $sql = "SELECT * FROM web_domain WHERE domain = ?";
+ $domain = $app->db->queryOneRecord($sql, $params['main_domain']);
+ }
if (!$domain) {
$this->server->fault('invalid parameters', 'No valid domain given.');
--
Gitblit v1.9.1