protocol in url setting

ONLYOFFICE · Feb 28, 2017 · a28a48d · a28a48d
1 parent 56e3669
commit a28a48d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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();
     }