allow background changes

TwanoO67 · Dec 3, 2018 · a1118ef · a1118ef
1 parent 80f430b
commit a1118ef
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 29 deletions.
diff --git a/api/login/auth.php b/api/login/auth.php
@@ -34,7 +34,6 @@
 	if ( $session->isAuthenticated() && $session->isTimeout() ) {
 		session_destroy();
 		session_start();
-		//$session = &\OMV\Session::getInstance();
 	}
 
 	$params = array(
@@ -55,7 +54,9 @@
 
       //construction de la config
       $str = buildConfig($context,$session);
-      file_put_contents('/etc/webdesk/webdesk_config.js',$str);
+      $js = 'WEBDESK_CONFIG = '.json_encode($str, JSON_PRETTY_PRINT );
+
+      file_put_contents('/etc/webdesk/webdesk_config.js',$js);
 
     }
 		echo json_encode($object);
@@ -69,25 +70,27 @@
 */
 
 function buildConfig($context,$session) {
-  return 'WEBDESK_CONFIG = {
-    "iconWidth": 100,
-    "username": "'.$session->getUsername().'",
-    "navbar" : '.buildNavBar($context,$session).',
-    "dock" : '.buildDock($context,$session).'
-  }';
+  $CONF = require('./config.php');
+  $CONF["iconWidth"] = 100;
+  $CONF["username"] = $session->getUsername();
+  $CONF["navbar"] = buildNavBar($context,$session);
+  $CONF["dock"] = buildDock($context,$session);
+
+  return $CONF;
 };
 
 function buildNavBar($context,$session) {
-  return '[
-    {
-      "label": "'.$session->getUsername().'",
-      "submenu":[{
-        "label": "Disconnect",
-        "link":"/login/logout.php"
-      }]
-    },
-
-  ]';
+  return [
+    [
+      "label" => $session->getUsername(),
+      "submenu" => [
+        [
+          "label" => "Disconnect",
+          "link" => "/login/logout.php"
+        ]
+      ]
+    ]
+  ];
 
   /*{
       "label": "File",
@@ -130,7 +133,7 @@ function buildDock($context,$session) {
     $prep[] = $link;
   }
 
-  return json_encode([
+  return [
     "default" => [
       [
         "uuid" => "about",
@@ -149,6 +152,5 @@ function buildDock($context,$session) {
       ]
     ],
     $session->getUsername() => $prep
-  ], JSON_PRETTY_PRINT );
+  ];
 };
-
diff --git a/api/login/login.php b/api/login/login.php
@@ -222,13 +222,18 @@ function login(){
 				document.location = "/";
 			}
 			else{
-				input_user.classList.remove("hide");
-				input_pass.classList.remove("hide");
-				loader.classList.remove("visible");
-				shake();
+				handleError()
 			}
-		});
-	}
+    },
+    handleError);
+  }
+
+  function handleError(){
+    input_user.classList.remove("hide");
+    input_pass.classList.remove("hide");
+    loader.classList.remove("visible");
+    shake();
+  }
 
 	function shake(){
 		login_box.classList.add("init-shake");
@@ -237,7 +242,7 @@ function shake(){
 		}, 1000);
 	}
 
-	function post(url,obj,callback){
+	function post(url,obj,callback,error){
 		var http = new XMLHttpRequest();
 		var str = "";
 		for (var key in obj) {
@@ -254,7 +259,10 @@ function post(url,obj,callback){
 		http.onreadystatechange = function() {//Call a function when the state changes.
 		    if(http.readyState == 4 && http.status == 200) {
 		        callback(http.responseText);
-		    }
+			}
+			else{
+				error(http);
+			}
 		}
 		http.send(str);
 	}

diff --git a/openmediavault-webdesk/debian/changelog b/openmediavault-webdesk/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault-webdesk (0.4.0) UNRELEASED; urgency=low
+
+  * Allow background change
+
+ -- Antoine Weber <[email protected]>  TODO
+
 openmediavault-webdesk (0.3.0) UNRELEASED; urgency=low
 
   * Fix folder permission, to write configuration file

diff --git a/src/index.html b/src/index.html
@@ -18,4 +18,8 @@
 <body>
   <app-root>Loading...</app-root>
 </body>
+<script>
+  if(typeof WEBDESK_CONFIG !== "undefined" && typeof WEBDESK_CONFIG["desktop_background"] !== "undefined"){
+    document.body.style.background = "url("+WEBDESK_CONFIG["desktop_background"]+") no-repeat center center fixed";
+  }</script>
 </html>