From a28a48d1430525c566c15d0882fb3d95d8589c03 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 28 Feb 2017 15:15:40 +0300
Subject: [PATCH] protocol in url setting

---
 CHANGELOG.md                      | 1 +
 controller/settingscontroller.php | 4 ++--
 lib/appconfig.php                 | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f75bd1ef..2d55425f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## owncloud-onlyoffice (1.0.1)
 - fix exception when versions app is disabled
+- adding protocol to document server url
 
 
 ## owncloud-onlyoffice (1.0.0)
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index dcdf7b56..84a70e9b 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -64,7 +64,7 @@ public function __construct($AppName,
      * @return TemplateResponse
      */
     public function index() {
-        $data = [ "documentserver" => $this->config->GetDocumentServerUrl()];
+        $data = ["documentserver" => $this->config->GetDocumentServerUrl()];
         return new TemplateResponse($this->appName, "settings", $data, "blank");
     }
 
@@ -77,7 +77,7 @@ public function index() {
      */
     public function settings($documentserver) {
         $this->config->SetDocumentServerUrl($documentserver);
-        return [ "documentserver" => $this->config->GetDocumentServerUrl()];
+        return ["documentserver" => $this->config->GetDocumentServerUrl()];
     }
 
     /**
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 1d34fbe8..8e640c5e 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -78,7 +78,10 @@ public function __construct($AppName) {
      * @param string $documentServer - document service address
      */
     public function SetDocumentServerUrl($documentServer) {
-        $documentServer = rtrim(trim($documentServer), "/");
+        $documentServer = strtolower(rtrim(trim($documentServer), "/"));
+        if (strlen($documentServer) > 0 && !preg_match("/^https?:\/\//i", $documentServer)) {
+            $documentServer = "http://" . $documentServer;
+        }
         $this->config->setAppValue($this->appName, $this->_documentserver, $documentServer);
         $this->DropSKey();
     }