From b37c8f9b6fddd080f7f78ba241ca2c7c07e9ada1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Thu, 8 Oct 2015 13:21:18 +0200
Subject: [PATCH] fix #229 and remove unused datetime state

---
 .../deviceplugins/datetime/deviceplugindatetime.cpp  | 12 ++++++------
 .../deviceplugins/datetime/deviceplugindatetime.json | 10 ----------
 server/webserver.cpp                                 | 12 ++++++++++++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.cpp b/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
index a65af8ba..a2e59e36 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
@@ -390,24 +390,24 @@ void DevicePluginDateTime::processTimesData(const QByteArray &data)
 
     // given time is always in UTC
     QVariantMap result = response.value("results").toMap();
-    QString duskString = result.value("civil_twilight_end").toString();
+    QString dawnString = result.value("civil_twilight_begin").toString();
     QString sunriseString = result.value("sunrise").toString();
     QString noonString = result.value("solar_noon").toString();
-    QString dawnString = result.value("civil_twilight_begin").toString();
     QString sunsetString = result.value("sunset").toString();
+    QString duskString = result.value("civil_twilight_end").toString();
 
-    m_dusk = QDateTime(QDate::currentDate(), QTime::fromString(duskString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
+    m_dawn = QDateTime(QDate::currentDate(), QTime::fromString(dawnString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
     m_sunrise = QDateTime(QDate::currentDate(), QTime::fromString(sunriseString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
     m_noon = QDateTime(QDate::currentDate(), QTime::fromString(noonString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
-    m_dawn = QDateTime(QDate::currentDate(), QTime::fromString(dawnString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
     m_sunset = QDateTime(QDate::currentDate(), QTime::fromString(sunsetString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
+    m_dusk = QDateTime(QDate::currentDate(), QTime::fromString(duskString, "h:m:s AP"), Qt::UTC).toTimeZone(m_timeZone);
 
     // calculate the times in each alarm
-    qCDebug(dcDateTime) << " dusk     :" << m_dusk.toString();
+    qCDebug(dcDateTime) << " dawn     :" << m_dawn.toString();
     qCDebug(dcDateTime) << " sunrise  :" << m_sunrise.toString();
     qCDebug(dcDateTime) << " noon     :" << m_noon.toString();
     qCDebug(dcDateTime) << " sunset   :" << m_sunset.toString();
-    qCDebug(dcDateTime) << " dawn     :" << m_dawn.toString();
+    qCDebug(dcDateTime) << " dusk     :" << m_dusk.toString();
     qCDebug(dcDateTime) << "---------------------------------------------";
 
     updateTimes();
diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.json b/plugins/deviceplugins/datetime/deviceplugindatetime.json
index 06d639b5..13165829 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.json
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.json
@@ -229,16 +229,6 @@
                             "idName": "alarm",
                             "name": "alarm"
                         }
-                    ],
-                    "stateTypes": [
-                        {
-                            "id": "261b79b5-b60d-4b14-af95-dc87184ec332",
-                            "idName": "nextAlarm",
-                            "name": "next alarm",
-                            "unit": "UnixTime",
-                            "type": "int",
-                            "defaultValue": 0
-                        }
                     ]
                 },
                 {
diff --git a/server/webserver.cpp b/server/webserver.cpp
index 0efeccbf..701d0f93 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -562,6 +562,11 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     }
     settings.endGroup();
 
+    GuhSettings globalSettings(GuhSettings::SettingsRoleGlobal);
+    globalSettings.beginGroup("WebSocketServer");
+    int websocketPort = globalSettings.value("port", 4444).toInt();
+    globalSettings.endGroup();
+
 
     QByteArray data;
     QXmlStreamWriter writer(&data);
@@ -580,6 +585,13 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
     } else {
         writer.writeTextElement("URLBase", "http://" + address.toString() + ":" + QString::number(m_port));
     }
+
+    if (m_useSsl) {
+        writer.writeTextElement("websocketURL", "wss://" + address.toString() + ":" + QString::number(websocketPort));
+    } else {
+        writer.writeTextElement("websocketURL", "ws://" + address.toString() + ":" + QString::number(websocketPort));
+    }
+
     writer.writeTextElement("presentationURL", "/");
 
     writer.writeStartElement("device");